From gerrit-no-reply at lists.osmocom.org Tue Sep 1 00:21:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 00:21:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_si4_cbch References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 ) Change subject: BSC_Tests/hopping: add TC_fh_params_si4_cbch ...................................................................... BSC_Tests/hopping: add TC_fh_params_si4_cbch Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/19927/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 578b207..ff42f6a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7148,6 +7148,74 @@ setverdict(pass); } +/* Verify the hopping parameters in System Information Type 4 */ +testcase TC_fh_params_si4_cbch() runs on test_CT { + var FHParamsTrx fhp := f_TC_fh_params_gen(tr_tn := 1); + var ASP_RSL_Unitdata rx_rsl_ud; + timer T := 5.0; + + f_init_vty(); + + /* (Re)configure TS0 as BCCH and TS1 as SDCCH8+CBCH */ + f_vty_enter_cfg_trx(BSCVTY, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config sdcch8+cbch"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + f_TC_fh_params_set(fhp); /* Enable frequency hopping */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1); + + T.start; + alt { + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_BCCH_INFO(RSL_SYSTEM_INFO_4))) -> value rx_rsl_ud { + var RSL_IE_Body ie := rx_rsl_ud.rsl.ies[2].body; /* FULL BCCH Information IE */ + var SystemInformation si := dec_SystemInformation(ie.other.payload); + + /* Make sure that what we decoded is System Information Type 4 */ + if (si.header.message_type != SYSTEM_INFORMATION_TYPE_4) { + setverdict(fail, "RSL FULL BCCH Information IE contains: ", si); + repeat; + } + + /* Make sure that CBCH Channel Description IE is present */ + if (not ispresent(si.payload.si4.cbch_chan_desc)) { + setverdict(fail, "CBCH Channel Description IE is absent"); + repeat; + } + + /* Finally, check the hopping parameters (HSN, MAIO) */ + f_TC_fh_params_match_chan_desc(fhp, si.payload.si4.cbch_chan_desc.v); + } + [] IPA_RSL[0].receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for RSL BCCH INFOrmation (SI4)"); + } + } + + /* Disable frequency hopping */ + f_TC_fh_params_unset(fhp); + + /* (Re)configure TS0 as CCCH+SDCCH4 and TS1 as TCH/F */ + f_vty_enter_cfg_trx(BSCVTY, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config tch/f"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + setverdict(pass); +} + /* Dyn PDCH todo: * activate OSMO as TCH/F * activate OSMO as TCH/H @@ -7380,6 +7448,7 @@ execute( TC_fh_params_chan_activ() ); execute( TC_fh_params_imm_ass() ); execute( TC_fh_params_assignment_cmd() ); + execute( TC_fh_params_si4_cbch() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Gerrit-Change-Number: 19927 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 1 01:46:27 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 01 Sep 2020 01:46:27 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f4da7fa6700a_1f162ad89e292600327693@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 314s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 314s] [COMPILING libboard/qmod/source/card_pres.c] [ 314s] [COMPILING libboard/qmod/source/wwan_led.c] [ 314s] [COMPILING libboard/qmod/source/i2c.c] [ 314s] [COMPILING libboard/qmod/source/board_qmod.c] [ 314s] [COMPILING apps/dfu/main.c] [ 315s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 315s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 315s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 315s] Memory region Used Size Region Size %age Used [ 315s] rom: 16588 B 16 KB 101.25% [ 315s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 315s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 315s] collect2: error: ld returned 1 exit status [ 315s] % [ 315s] make[2]: *** [Makefile:234: flash] Error 1 [ 315s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 315s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 315s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 315s] dh_auto_build: error: make -j1 returned exit code 2 [ 315s] make: *** [debian/rules:16: build] Error 25 [ 315s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 315s] ### VM INTERACTION START ### [ 318s] [ 304.090229] sysrq: Power Off [ 318s] [ 304.105012] reboot: Power down [ 319s] ### VM INTERACTION END ### [ 319s] [ 319s] lamb01 failed "build simtrace2_0.7.0.63.39070.dsc" at Tue Sep 1 01:46:24 UTC 2020. [ 319s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Sep 1 07:37:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 07:37:46 +0000 Subject: Change in osmo-e1d[master]: usb: Don't pass negative length values to e1_line_demux_in() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19928 ) Change subject: usb: Don't pass negative length values to e1_line_demux_in() ...................................................................... usb: Don't pass negative length values to e1_line_demux_in() every so often, the USB transfer completes without data (due to "unlucky" time alignment between E1 and USB frame clock). Don't call the demuxer in that case. Otherwise the user is confused by error messages like <0001> intf_line.c:467 (I0:L0) IN ERROR: -4 Change-Id: Ia99f97c2cca44d15a83a54cebe884b343ec44f46 --- M src/usb.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/28/19928/1 diff --git a/src/usb.c b/src/usb.c index 7a5dce2..7f7f5c6 100644 --- a/src/usb.c +++ b/src/usb.c @@ -107,6 +107,8 @@ static int e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int size) { + if (size == 0) + return 0; return e1_line_demux_in(flow->line, buf + 4, size - 4); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia99f97c2cca44d15a83a54cebe884b343ec44f46 Gerrit-Change-Number: 19928 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 07:37:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 07:37:47 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add support for osmo-e1d References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19929 ) Change subject: e1-prbs-test: Add support for osmo-e1d ...................................................................... e1-prbs-test: Add support for osmo-e1d This allows e1-prbs-test to not only use DAHDI devices, but also osmo-e1d supported devices Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 --- M contrib/e1-prbs-test/Makefile M contrib/e1-prbs-test/main.c 2 files changed, 55 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/29/19929/1 diff --git a/contrib/e1-prbs-test/Makefile b/contrib/e1-prbs-test/Makefile index 172847f..598366a 100644 --- a/contrib/e1-prbs-test/Makefile +++ b/contrib/e1-prbs-test/Makefile @@ -1,5 +1,5 @@ -LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore) -LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore) +LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore libosmo-e1d) +LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore libosmo-e1d) CFLAGS=-O2 -g -Wall -Werror $(LIBOSMO_CFLAGS) LIBS=$(LIBOSMO_LIBS) diff --git a/contrib/e1-prbs-test/main.c b/contrib/e1-prbs-test/main.c index 4fe0e84..a124087 100644 --- a/contrib/e1-prbs-test/main.c +++ b/contrib/e1-prbs-test/main.c @@ -40,6 +40,8 @@ #include #include +#include + #include "internal.h" static struct test_state g_tst; @@ -69,12 +71,58 @@ return 0; } +static void init_timeslot(struct timeslot_state *ts) +{ + osmo_fd_register(&ts->ofd); + printf("E1TS(%02u) opened\n", ts->ofd.priv_nr); + + ts_init_prbs_tx(ts, g_prbs_offs_tx); + ts_init_prbs_rx(ts, g_prbs_offs_rx); + + /* start to put something into the transmit queue, before we get read-triggered + * later on */ + process_tx(ts, 1024); +} + +static int open_slots_e1d(struct test_state *tst, int intf_nr, int line_nr) +{ + struct osmo_e1dp_client *clnt = osmo_e1dp_client_create(NULL, E1DP_DEFAULT_SOCKET); + int i, rc, num_slots = 0; + + if (!clnt) { + fprintf(stderr, "Unable to connect to osmo-e1d\n"); + return -1; + } + + for (i = 1; i < 32; i++) { + struct timeslot_state *ts; + rc = osmo_e1dp_client_ts_open(clnt, intf_nr, line_nr, i, E1DP_TSMODE_RAW, 1024); + if (rc < 0) { + fprintf(stderr, "Error opening %d: %d (%s)\n", i, rc, strerror(errno)); + return -1; + } + ts = &tst->ts[tst->next_unused_ts++]; + + /* open the respective file descriptor */ + osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, i); + + init_timeslot(ts); + num_slots++; + } + + return num_slots; +} + static int open_slots(struct test_state *tst, const char *basedir) { - DIR *dir = opendir(basedir); + DIR *dir; struct dirent *ent; int rc, num_slots = 0; + if (!strcmp(basedir, "e1d")) + return open_slots_e1d(tst, 0, 0); + + dir = opendir(basedir); if (!dir) return -ENOENT; @@ -99,15 +147,6 @@ /* open the respective file descriptor */ osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, atoi(ent->d_name)); - osmo_fd_register(&ts->ofd); - printf("E1TS(%02u) opened\n", ts->ofd.priv_nr); - - ts_init_prbs_tx(ts, g_prbs_offs_tx); - ts_init_prbs_rx(ts, g_prbs_offs_rx); - - /* start to put something into the transmit queue, before we get read-triggered - * later on */ - process_tx(ts, 1024); cfg_dahdi_buffer(ts->ofd.fd); struct dahdi_bufferinfo bi; @@ -115,6 +154,8 @@ OSMO_ASSERT(rc == 0); printf("tx_pol=%d, rx_pol=%d, num=%d, size=%d, nread=%d, nwrite=%d\n", bi.txbufpolicy, bi.rxbufpolicy, bi.numbufs, bi.bufsize, bi.readbufs, bi.writebufs); + + init_timeslot(ts); num_slots++; } closedir(dir); @@ -198,6 +239,8 @@ set_realtime(10); rc = open_slots(&g_tst, basedir); + if (rc < 0) + exit(1); printf("==> opened a total of %d slots\n", rc); signal(SIGINT, sig_handler); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 Gerrit-Change-Number: 19929 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 07:38:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 07:38:51 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add support for osmo-e1d In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19929 ) Change subject: e1-prbs-test: Add support for osmo-e1d ...................................................................... Patch Set 1: Code-Review-1 let's add a way to specify interface + line number for e1d in the 'filename' before merging. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 Gerrit-Change-Number: 19929 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 01 Sep 2020 07:38:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 07:40:17 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 1 Sep 2020 07:40:17 +0000 Subject: Change in osmo-e1d[master]: usb: Don't pass negative length values to e1_line_demux_in() In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19928 ) Change subject: usb: Don't pass negative length values to e1_line_demux_in() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia99f97c2cca44d15a83a54cebe884b343ec44f46 Gerrit-Change-Number: 19928 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 01 Sep 2020 07:40:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 07:40:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 07:40:57 +0000 Subject: Change in osmo-e1d[master]: usb: Don't pass negative length values to e1_line_demux_in() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19928 ) Change subject: usb: Don't pass negative length values to e1_line_demux_in() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia99f97c2cca44d15a83a54cebe884b343ec44f46 Gerrit-Change-Number: 19928 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 01 Sep 2020 07:40:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 07:41:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 07:41:00 +0000 Subject: Change in osmo-e1d[master]: usb: Don't pass negative length values to e1_line_demux_in() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19928 ) Change subject: usb: Don't pass negative length values to e1_line_demux_in() ...................................................................... usb: Don't pass negative length values to e1_line_demux_in() every so often, the USB transfer completes without data (due to "unlucky" time alignment between E1 and USB frame clock). Don't call the demuxer in that case. Otherwise the user is confused by error messages like <0001> intf_line.c:467 (I0:L0) IN ERROR: -4 Change-Id: Ia99f97c2cca44d15a83a54cebe884b343ec44f46 --- M src/usb.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/usb.c b/src/usb.c index 7a5dce2..7f7f5c6 100644 --- a/src/usb.c +++ b/src/usb.c @@ -107,6 +107,8 @@ static int e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int size) { + if (size == 0) + return 0; return e1_line_demux_in(flow->line, buf + 4, size - 4); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia99f97c2cca44d15a83a54cebe884b343ec44f46 Gerrit-Change-Number: 19928 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 10:07:10 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 1 Sep 2020 10:07:10 +0000 Subject: Change in osmo-mgw[master]: mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockad... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19883 ) Change subject: mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibbfc1c2485636502dc0f3aef3922432cc7fd6170 Gerrit-Change-Number: 19883 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 10:07:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 10:18:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 10:18:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add minimalistic AssignmentCommand In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 to look at the new patch set (#2). Change subject: library/GSM_RR_Types: add minimalistic AssignmentCommand ...................................................................... library/GSM_RR_Types: add minimalistic AssignmentCommand Unfortunately, the existing implementation [1] is somewhat incomplete and unfriendly to build templates on: - some fields holding integer numbers defined as BITx, so we would have to do bit2int() / int2bit(); - some bit-map fields defined as octetstrings; - some fields are not decoded at all (raw octetstrings). Let's work this around by defining a minimalistic implementation of (RR) Assignment Command with all mandatory and some optional fields. Reuse some IEs directly from MobileL3_RRM_Types. [1] titan.ProtocolModules.MobileL3_v13.4.0 MobileL3_RRM_Types.PDU_RRM_AssignmentCommand_NW_MS Change-Id: If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 Related: SYS#4868, OS#4545 --- M library/GSM_RR_Types.ttcn M sysinfo/gen_links.sh 2 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/19924/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 Gerrit-Change-Number: 19924 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 10:18:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 10:18:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_assignment_cmd In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 to look at the new patch set (#3). Change subject: BSC_Tests/hopping: add TC_fh_params_assignment_cmd ...................................................................... BSC_Tests/hopping: add TC_fh_params_assignment_cmd This test case verifies presence and correctness of the hopping parameters in the following messages and their IEs: 1. (RR) Assignment Command 1.1. Description of the First Channel, after time IE 1.2. Mobile Allocation, after time IE Change-Id: Id12509385b444c426f4af7a0cf0d46efe2cb0eda Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/19926/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id12509385b444c426f4af7a0cf0d46efe2cb0eda Gerrit-Change-Number: 19926 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 10:18:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 10:18:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_si4_cbch In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 to look at the new patch set (#2). Change subject: BSC_Tests/hopping: add TC_fh_params_si4_cbch ...................................................................... BSC_Tests/hopping: add TC_fh_params_si4_cbch This test case verifies presence and correctness of the hopping parameters in (RR) System Information Type 4 (CBCH description). Since the C0/TS0 (BCCH+SDCCH4+CBCH) shall not be hopping, let's temporarily re-configure TS0 as BCCH, and TS1 as SDCCH8+CBCH. According to 3GPP TS 44.018, section 9.1.36.1, if CBCH is active in the cell, the CBCH Channel Description IE indicates where to find it (physical channel description). According to section 9.1.36.2, the CBCH Mobile Allocation IE shall be included if CBCH Channel Description IE indicates that frequency hopping is in use. Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/19927/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Gerrit-Change-Number: 19927 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 10:21:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 10:21:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_{chan_activ, imm_ass} In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 ) Change subject: BSC_Tests/hopping: add TC_fh_params_{chan_activ,imm_ass} ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib9218b61a2b0c0467340656e4b65a36b7b0ba302 Gerrit-Change-Number: 19910 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 10:21:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:00:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:00:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... bsc: Fix race condition waiting for RESET-ACK This scenario appeared in jenkins runs of BSC_Tests making TC_ctrl_msc_connection_status fail (the first test in the suite). I could however not reproduce it on my local docker setup because it really seems like a timing race condition. The scenario is: TTCN3 -> BSC: RESET TTCN3 <- BSC: RESET TTCN3 -> BSC: RESET-ACK In there, TTCN3's f_legacy_bssap_reset() expected a RESET-ACK to be received, but it may well be that the other end never saw the RESET and hence it will never sent the RESET-ACK, since it indicated it became available afterwards. In that case (RESET received), let's not fail if a RESET-ACK is never received, since the connection is actually in the desired state and this scenario can happen and it's all fine. Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a --- M bsc/BSC_Tests.ttcn 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/19930/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4560957..28a16ec 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -744,6 +744,7 @@ private function f_legacy_bssap_reset(integer bssap_idx := 0) runs on test_CT { var BSSAP_N_UNITDATA_ind ud_ind; + var boolean reset_received := false; timer T := 5.0; BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled))); @@ -757,10 +758,20 @@ log("Respoding to inbound RESET with RESET-ACK"); BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress, ts_BSSMAP_ResetAck(g_osmux_enabled))); + reset_received := true; repeat; } [] BSSAP.receive { repeat; } - [] T.timeout { setverdict(fail, "Waiting for RESET-ACK after sending RESET"); } + [] T.timeout { + log("Timeout waiting for RESET-ACK after sending RESET"); + /* If we received a RESET after ours was sent, it + may be a race condition where the other peer beacame + available after we sent it, but we are in a desired + state anyway, so go forward. */ + if (not reset_received) { + setverdict(fail); + } + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:22:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:22:09 +0000 Subject: Change in libosmocore[master]: socket: Add some osmo_sockaddr print helpers In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19917 ) Change subject: socket: Add some osmo_sockaddr print helpers ...................................................................... Patch Set 1: Code-Review+2 Trivial patch, adding +2 myself to get already +2ed patches above fixing the issue. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie07a38b05b7888885dba4ae795e9f3d9a561543d Gerrit-Change-Number: 19917 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 11:22:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:22:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:22:15 +0000 Subject: Change in libosmocore[master]: socket: Add some osmo_sockaddr print helpers In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19917 ) Change subject: socket: Add some osmo_sockaddr print helpers ...................................................................... socket: Add some osmo_sockaddr print helpers These are APIs useful to inline in log calls. Change-Id: Ie07a38b05b7888885dba4ae795e9f3d9a561543d --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 35 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 9cb8d6b..e6a6bd5 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -75,6 +75,9 @@ size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, const struct sockaddr_in *sin); +const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst); +uint16_t osmo_sockaddr_port(const struct sockaddr *sa); + int osmo_sock_unix_init(uint16_t type, uint8_t proto, const char *socket_path, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index f91ad10..e8a2ce2 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1001,6 +1001,38 @@ return 0; } +/*! inet_ntop() wrapper for a struct sockaddr. + * \param[in] sa source sockaddr to get the address from. + * \param[out] dst string buffer of at least INET6_ADDRSTRLEN size. + * \returns returns a non-null pointer to dst. NULL is returned if there was an + * error, with errno set to indicate the error. + */ +const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst) +{ + const struct osmo_sockaddr *osa = (const struct osmo_sockaddr *)sa; + return inet_ntop(osa->u.sa.sa_family, + osa->u.sa.sa_family == AF_INET6 ? + (const void *)&osa->u.sin6.sin6_addr : + (const void *)&osa->u.sin.sin_addr, + dst, INET6_ADDRSTRLEN); +} + +/*! Get sockaddr port content (in host byte order) + * \param[in] sa source sockaddr to get the port from. + * \returns returns the sockaddr port in host byte order + */ +uint16_t osmo_sockaddr_port(const struct sockaddr *sa) +{ + const struct osmo_sockaddr *osa = (const struct osmo_sockaddr *)sa; + switch (osa->u.sa.sa_family) { + case AF_INET6: + return ntohs(osa->u.sin6.sin6_port); + case AF_INET: + return ntohs(osa->u.sin.sin_port); + } + return 0; +} + /*! Initialize a unix domain socket (including bind/connect) * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie07a38b05b7888885dba4ae795e9f3d9a561543d Gerrit-Change-Number: 19917 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:22:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:22:16 +0000 Subject: Change in libosmocore[master]: tests: Add test to showcase osmo_sock_init2 bug with AF_UNSPEC In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19918 ) Change subject: tests: Add test to showcase osmo_sock_init2 bug with AF_UNSPEC ...................................................................... tests: Add test to showcase osmo_sock_init2 bug with AF_UNSPEC The function is checking for IP version matching between local and remote addresses even if only one is needed based on flags. For example, if user only desired to bind, the remote address should not be used nor checked. Bug was introduced here: 2c962f5de1eeea119cfac7d9d92db31c570353b9 Change-Id: I87afd1db9bd017426abcc959fa515d15784cdf1c --- M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 3 files changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved lynxis lazus: Looks good to me, but someone else must approve diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index a2e103c..5cf20b7 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -143,6 +144,11 @@ OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); OSMO_ASSERT(fd >= 0); + printf("Checking osmo_sock_init2(AF_UNSPEC) BIND on IPv4\n"); + fd = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "127.0.0.1", 0, NULL, 0, + OSMO_SOCK_F_BIND); + OSMO_ASSERT(fd == -ENODEV); /* BUG! */ + talloc_free(name); return 0; diff --git a/tests/socket/socket_test.err b/tests/socket/socket_test.err index 0f0f8da..37504e7 100644 --- a/tests/socket/socket_test.err +++ b/tests/socket/socket_test.err @@ -2,3 +2,4 @@ invalid: you have to specify either BIND or CONNECT flags Unable to find a common protocol (IPv4 or IPv6) for local host: 127.0.0.1 and remote host: ::1. Unable to find a common protocol (IPv4 or IPv6) for local host: ::1 and remote host: 127.0.0.1. +Unable to find a common protocol (IPv4 or IPv6) for local host: 127.0.0.1 and remote host: (null). diff --git a/tests/socket/socket_test.ok b/tests/socket/socket_test.ok index 4265be8..696e356 100644 --- a/tests/socket/socket_test.ok +++ b/tests/socket/socket_test.ok @@ -9,3 +9,4 @@ Checking osmo_sock_init2(AF_UNSPEC) must fail on mixed IPv6 & IPv4 Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv4 Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv6 +Checking osmo_sock_init2(AF_UNSPEC) BIND on IPv4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I87afd1db9bd017426abcc959fa515d15784cdf1c Gerrit-Change-Number: 19918 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:22:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:22:16 +0000 Subject: Change in libosmocore[master]: socket: Fix bug in osmo_sock_init2(AF_UNSPEC) matching IP versions In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19919 ) Change subject: socket: Fix bug in osmo_sock_init2(AF_UNSPEC) matching IP versions ...................................................................... socket: Fix bug in osmo_sock_init2(AF_UNSPEC) matching IP versions See previous commit for a bug description. Fixes: 2c962f5de1eeea119cfac7d9d92db31c570353b9 Change-Id: I59bf4b4b3ed14766a5a5285923d1ffa9fc8b2294 --- M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err 3 files changed, 22 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index e8a2ce2..56f01dc 100644 --- a/src/socket.c +++ b/src/socket.c @@ -316,19 +316,27 @@ } } - /* priotize ipv6 as per RFC */ - if (local_ipv6 && remote_ipv6) - family = AF_INET6; - else if (local_ipv4 && remote_ipv4) - family = AF_INET; - else { - if (local) - freeaddrinfo(local); - if (remote) - freeaddrinfo(remote); - LOGP(DLGLOBAL, LOGL_ERROR, "Unable to find a common protocol (IPv4 or IPv6) for local host: %s and remote host: %s.\n", - local_host, remote_host); - return -ENODEV; + if ((flags & OSMO_SOCK_F_BIND) && (flags & OSMO_SOCK_F_CONNECT)) { + /* prioritize ipv6 as per RFC */ + if (local_ipv6 && remote_ipv6) + family = AF_INET6; + else if (local_ipv4 && remote_ipv4) + family = AF_INET; + else { + if (local) + freeaddrinfo(local); + if (remote) + freeaddrinfo(remote); + LOGP(DLGLOBAL, LOGL_ERROR, + "Unable to find a common protocol (IPv4 or IPv6) " + "for local host: %s and remote host: %s.\n", + local_host, remote_host); + return -ENODEV; + } + } else if ((flags & OSMO_SOCK_F_BIND)) { + family = local_ipv6 ? AF_INET6 : AF_INET; + } else if ((flags & OSMO_SOCK_F_CONNECT)) { + family = remote_ipv6 ? AF_INET6 : AF_INET; } } diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 5cf20b7..ae77184 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -147,7 +147,7 @@ printf("Checking osmo_sock_init2(AF_UNSPEC) BIND on IPv4\n"); fd = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "127.0.0.1", 0, NULL, 0, OSMO_SOCK_F_BIND); - OSMO_ASSERT(fd == -ENODEV); /* BUG! */ + OSMO_ASSERT(fd >= 0); talloc_free(name); diff --git a/tests/socket/socket_test.err b/tests/socket/socket_test.err index 37504e7..0f0f8da 100644 --- a/tests/socket/socket_test.err +++ b/tests/socket/socket_test.err @@ -2,4 +2,3 @@ invalid: you have to specify either BIND or CONNECT flags Unable to find a common protocol (IPv4 or IPv6) for local host: 127.0.0.1 and remote host: ::1. Unable to find a common protocol (IPv4 or IPv6) for local host: ::1 and remote host: 127.0.0.1. -Unable to find a common protocol (IPv4 or IPv6) for local host: 127.0.0.1 and remote host: (null). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I59bf4b4b3ed14766a5a5285923d1ffa9fc8b2294 Gerrit-Change-Number: 19919 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:23:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:23:31 +0000 Subject: Change in osmo-mgw[master]: mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockad... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19883 ) Change subject: mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation ...................................................................... mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation Change-Id: Ibbfc1c2485636502dc0f3aef3922432cc7fd6170 --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 22 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c index ef4da17..c68d8b3 100644 --- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -517,17 +518,33 @@ bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci *ci, struct sockaddr_storage *dest) { const struct mgcp_conn_peer *rtp_info; + int family; struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(ci); if (!rtp_info) return false; - sin = (struct sockaddr_in *)dest; - - sin->sin_family = AF_INET; - sin->sin_addr.s_addr = inet_addr(rtp_info->addr); - sin->sin_port = osmo_ntohs(rtp_info->port); + family = osmo_ip_str_type(rtp_info->addr); + switch (family) { + case AF_INET: + sin = (struct sockaddr_in *)dest; + sin->sin_family = AF_INET; + sin->sin_port = osmo_ntohs(rtp_info->port); + if (inet_pton(AF_INET, rtp_info->addr, &sin->sin_addr) != 1) + return false; + break; + case AF_INET6: + sin6 = (struct sockaddr_in6 *)dest; + sin6->sin6_family = AF_INET6; + sin6->sin6_port = osmo_ntohs(rtp_info->port); + if (inet_pton(AF_INET6, rtp_info->addr, &sin6->sin6_addr) != 1) + return false; + break; + default: + return false; + } return true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibbfc1c2485636502dc0f3aef3922432cc7fd6170 Gerrit-Change-Number: 19883 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:23:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:23:32 +0000 Subject: Change in osmo-mgw[master]: mgcp-client: Fix trailing whitespace in mgcp_client_fsm.h In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19886 ) Change subject: mgcp-client: Fix trailing whitespace in mgcp_client_fsm.h ...................................................................... mgcp-client: Fix trailing whitespace in mgcp_client_fsm.h Change-Id: Iad9ee764c1b6d7960a810a3eef95b207596e4796 --- M include/osmocom/mgcp_client/mgcp_client_fsm.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index c763d74..a1ebbb6 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -8,7 +8,7 @@ * (either remote or local). It is used to pass parameters (local) to the FSM * and get responses (remote) from the FSM as pointer attached to the FSM * event. - * + * * When modifiying a connection, the endpoint and call_id members may be left * unpopulated. The call_id field is ignored in this case. If an endpoint * identifier is supplied it is checked against the internal state to make -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iad9ee764c1b6d7960a810a3eef95b207596e4796 Gerrit-Change-Number: 19886 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:28:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:28:01 +0000 Subject: Change in osmo-trx[master]: Add support for TRXC MUTE command In-Reply-To: References: Message-ID: Hello tnt, fixeria, laforge, Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 to look at the new patch set (#3). Change subject: Add support for TRXC MUTE command ...................................................................... Add support for TRXC MUTE command Related: SYS#4920 Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/28/19828/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 Gerrit-Change-Number: 19828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:33:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 11:33:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 11:33:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:35:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 11:35:56 +0000 Subject: Change in osmo-trx[master]: Add support for TRXC MUTE command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19828 ) Change subject: Add support for TRXC MUTE command ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19828/3/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19828/3/Transceiver52M/Transceiver.cpp at 1018 PS3, Line 1018: mStates[chan].mMuted = mute ? true : false; It would be nice to also add a log statement here, but this is just an idea. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 Gerrit-Change-Number: 19828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 01 Sep 2020 11:35:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:41:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:41:01 +0000 Subject: Change in libosmo-sccp[master]: Fix (2) change in ss7 server default listen addr, keeps backward-comp... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 ) Change subject: Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior ...................................................................... Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior This patch is a fixup or extension of commit 96d348efbf29888f5ef923251c7d51d45a897c0b, which only fixed the default values for "asp" VTY node, but not for the xua server's "listen" node. As a result, without this patch, by default the SCTP server socket will only listen on IPv4's "0.0.0.0", since NULL is resolved by getaddrinfo to it instead of "::" as first candidate. Fixes: 96d348efbf29888f5ef923251c7d51d45a897c0b Change-Id: Ifbc8df854d1f1e9b07b11911ad5da8cdf9f2080a --- M src/osmo_ss7_vty.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/31/19931/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 3035844..109b94a 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1871,8 +1871,13 @@ case L_CS7_XUA_NODE: oxs = vty->index; /* If no local addr was set, or erased after _create(): */ - if (!oxs->cfg.local.host_cnt) - osmo_ss7_xua_server_set_local_host(oxs, NULL); + if (!oxs->cfg.local.host_cnt) { + /* "::" Covers both IPv4 and IPv6 */ + if (ipv6_sctp_supported("::", true)) + osmo_ss7_xua_server_set_local_host(oxs, "::"); + else + osmo_ss7_xua_server_set_local_host(oxs, "0.0.0.0"); + } if (osmo_ss7_xua_server_bind(oxs) < 0) vty_out(vty, "%% Unable to bind xUA server to IP(s)%s", VTY_NEWLINE); vty->node = L_CS7_NODE; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifbc8df854d1f1e9b07b11911ad5da8cdf9f2080a Gerrit-Change-Number: 19931 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 11:43:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 11:43:45 +0000 Subject: Change in osmo-trx[master]: Add support for TRXC MUTE command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19828 ) Change subject: Add support for TRXC MUTE command ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19828/3/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19828/3/Transceiver52M/Transceiver.cpp at 1018 PS3, Line 1018: mStates[chan].mMuted = mute ? true : false; > It would be nice to also add a log statement here, but this is just an idea. We don't do it for most commands, since the general TRXC logging is enough. It only makes sense for complex commands like setformat negotiations. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 Gerrit-Change-Number: 19828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 01 Sep 2020 11:43:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 12:22:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 12:22:15 +0000 Subject: Change in libosmo-sccp[master]: Fix default ASP local addr if remote addr contains only IPv4 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 ) Change subject: Fix default ASP local addr if remote addr contains only IPv4 ...................................................................... Fix default ASP local addr if remote addr contains only IPv4 Otherwise it would end up attempting to connect "::" -> "1.2.3.4" which would fail during osmo_sock_init2_multiaddr(). If local address is unset (default), but only IPv4 addresses are set on the remote, then one must use "0.0.0.0" instead. Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 --- M src/osmo_ss7_vty.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/32/19932/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 109b94a..13ed18a 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -29,6 +29,8 @@ #include #include +#include + #include #include #include @@ -1842,8 +1844,18 @@ asp = vty->index; /* If no local addr was set */ if (!asp->cfg.local.host_cnt) { - /* "::" Covers both IPv4 and IPv6 */ - if (ipv6_sctp_supported("::", true)) + bool rem_has_v4 = false, rem_has_v6 = false; + int i; + for (i = 0; i < asp->cfg.remote.host_cnt; i++) { + if (osmo_ip_str_type(asp->cfg.remote.host[i]) == AF_INET6) + rem_has_v6 = true; + else + rem_has_v4 = true; + } + /* "::" Covers both IPv4 and IPv6, but if only IPv4 + * address are set on the remote side, IPv4 on the local side + * must be set too */ + if (ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6)) osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); else osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 Gerrit-Change-Number: 19932 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 12:23:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 12:23:11 +0000 Subject: Change in libosmo-sccp[master]: Fix default ASP local addr if remote addr contains only IPv4 In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 ) Change subject: Fix default ASP local addr if remote addr contains only IPv4 ...................................................................... Fix default ASP local addr if remote addr contains only IPv4 Otherwise it would end up attempting to connect "::" -> "1.2.3.4" which would fail during osmo_sock_init2_multiaddr(). If local address is unset (default), but only IPv4 addresses are set on the remote, then one must use "0.0.0.0" instead. Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 --- M src/osmo_ss7_vty.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/32/19932/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 Gerrit-Change-Number: 19932 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 12:25:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 12:25:59 +0000 Subject: Change in libosmo-sccp[master]: Fix default ASP local addr if remote addr contains only IPv4 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 ) Change subject: Fix default ASP local addr if remote addr contains only IPv4 ...................................................................... Patch Set 2: This one fixes ttcn3-bsc-test failing -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 Gerrit-Change-Number: 19932 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 12:25:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 13:01:52 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 1 Sep 2020 13:01:52 +0000 Subject: Change in libosmo-sccp[master]: Fix (2) change in ss7 server default listen addr, keeps backward-comp... In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 ) Change subject: Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior ...................................................................... Patch Set 1: Code-Review+1 tested, fixes the problem I was seeing re conversation on IRC. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifbc8df854d1f1e9b07b11911ad5da8cdf9f2080a Gerrit-Change-Number: 19931 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Comment-Date: Tue, 01 Sep 2020 13:01:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 13:48:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 13:48:53 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local a... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19933 ) Change subject: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local address ...................................................................... ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local address Change-Id: Ic2b608a055635f94d74cc24c3a934d6458934e82 --- M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/33/19933/1 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 2e349a4..4d73311 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -55,6 +55,7 @@ cs7 instance 0 point-code 0.23.3 asp asp-clnt-msc-0 5000 0 ipa + local-ip 172.18.12.20 remote-ip 172.18.12.203 as as-clnt-msc-0 ipa asp asp-clnt-msc-0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic2b608a055635f94d74cc24c3a934d6458934e82 Gerrit-Change-Number: 19933 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:06:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 14:06:05 +0000 Subject: Change in libosmo-sccp[master]: Fix default ASP local addr if remote addr contains only IPv4 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 ) Change subject: Fix default ASP local addr if remote addr contains only IPv4 ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 Gerrit-Change-Number: 19932 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 14:06:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:20:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 14:20:40 +0000 Subject: Change in osmo-bsc[master]: vty: Hide show running-config ACC ramping params if not enabled References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19934 ) Change subject: vty: Hide show running-config ACC ramping params if not enabled ...................................................................... vty: Hide show running-config ACC ramping params if not enabled If the feature is not enabled there's no real use in displaying default values for it. Related: SYS#4912 Change-Id: I759eb0c31dd3c9b6f5f3d2bf57c6efc9ac5f74f1 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/19934/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index fc7dd16..ef10c49 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -955,12 +955,14 @@ if (bts->acc_mgr.rotation_time_sec != ACC_MGR_QUANTUM_DEFAULT) vty_out(vty, " access-control-class-rotate-quantum %" PRIu32 "%s", bts->acc_mgr.rotation_time_sec, VTY_NEWLINE); vty_out(vty, " %saccess-control-class-ramping%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "no ", VTY_NEWLINE); - vty_out(vty, " access-control-class-ramping-step-interval %u%s", - acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); - vty_out(vty, " access-control-class-ramping-step-size %u%s", acc_ramp_get_step_size(&bts->acc_ramp), - VTY_NEWLINE); - vty_out(vty, " access-control-class-ramping-chan-load %u %u%s", - bts->acc_ramp.chan_load_lower_threshold, bts->acc_ramp.chan_load_upper_threshold, VTY_NEWLINE); + if (acc_ramp_is_enabled(&bts->acc_ramp)) { + vty_out(vty, " access-control-class-ramping-step-interval %u%s", + acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); + vty_out(vty, " access-control-class-ramping-step-size %u%s", acc_ramp_get_step_size(&bts->acc_ramp), + VTY_NEWLINE); + vty_out(vty, " access-control-class-ramping-chan-load %u %u%s", + bts->acc_ramp.chan_load_lower_threshold, bts->acc_ramp.chan_load_upper_threshold, VTY_NEWLINE); + } if (!bts->si_unused_send_empty) vty_out(vty, " no system-information unused-send-empty%s", VTY_NEWLINE); for (i = SYSINFO_TYPE_1; i < _MAX_SYSINFO_TYPE; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I759eb0c31dd3c9b6f5f3d2bf57c6efc9ac5f74f1 Gerrit-Change-Number: 19934 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:42:04 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 1 Sep 2020 14:42:04 +0000 Subject: Change in osmo-msc[master]: Don't Store an SMS in the database when the ESME is not Bound References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19935 ) Change subject: Don't Store an SMS in the database when the ESME is not Bound ...................................................................... Don't Store an SMS in the database when the ESME is not Bound We may never be able to deliver this SMS if it depends on the ESME, as we will not resubmit the SMS to the ESME. Better to reject it at this time and have the MS try again later. Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Related: OS#4740 --- M src/libmsc/gsm_04_11.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/19935/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 5c26929..e5063dc 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -633,6 +633,16 @@ if (gsms->smpp.esme) { return -EINPROGRESS; } + + /* This SMS got routed through SMPP, but the configured ESME was + * unavailable at this time. This is an OOO condition. + * Don't store this SMS in the database as we may never be + * able to deliver it. (we would need to process the stored SMS and + * attempt re-submission to the ESME) + */ + if (rc == GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER) + return rc; + /* * This SMS got routed through SMPP or no receiver exists. * In any case, we store it in the database for further processing. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Gerrit-Change-Number: 19935 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:45:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 14:45:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_{chan_activ, imm_ass} In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 to look at the new patch set (#5). Change subject: BSC_Tests/hopping: add TC_fh_params_{chan_activ,imm_ass} ...................................................................... BSC_Tests/hopping: add TC_fh_params_{chan_activ,imm_ass} This test case verifies presence and correctness of the hopping parameters in the following messages and their IEs: 1. RSL CHANnel ACTIVation 1.1. Channel Identification IE 2. RSL IMMEDIATE ASSIGN COMMAND 2.1. Channel Description IE 2.2. Mobile Allocation IE The hopping parameters are randomly generated and configured via the VTY interface in the beginning, and unset in the end. Change-Id: Ib9218b61a2b0c0467340656e4b65a36b7b0ba302 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 274 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/19910/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib9218b61a2b0c0467340656e4b65a36b7b0ba302 Gerrit-Change-Number: 19910 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:49:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 1 Sep 2020 14:49:18 +0000 Subject: Change in osmo-msc[master]: Don't Store an SMS in the database when the ESME is not Bound In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19935 ) Change subject: Don't Store an SMS in the database when the ESME is not Bound ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19935/1/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/c/osmo-msc/+/19935/1/src/libmsc/gsm_04_11.c at 647 PS1, Line 647: This SMS got routed through SMPP or no receiver exists. : * In any case, we store it in the database for further processing. This comment does not make sense then... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Gerrit-Change-Number: 19935 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 01 Sep 2020 14:49:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:51:38 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 1 Sep 2020 14:51:38 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... Patch Set 2: (10 comments) This change is ready for review. https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/include/osmocom/bsc/lchan_fsm.h File include/osmocom/bsc/lchan_fsm.h: https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/include/osmocom/bsc/lchan_fsm.h at 21 PS1, Line 21: LCHAN_ST_WAIT_CHAN_MODE_MODIF_ACK, : LCHAN_ST_WAIT_RSL_MT_MODE_MODIFY_ACK > the first one is about RR to the UE, the second one is about RSL to the BTS. [?] The names are derived from what I have found in abis_rsl_rx_dchan() in abis_rsl.c but the naming is indeed wired. I think I have found better names now. https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/include/osmocom/bsc/lchan_fsm.h at 60 PS1, Line 60: void lchan_modfy(struct gsm_lchan *lchan, struct lchan_activate_info *info); > "lchan_mode_modify" with 'mode_' and 'i' please Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/assignment_fsm.c at 442 PS1, Line 442: * however, this will be not the common case. */ > (maybe rather drop the "however... [?] Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/assignment_fsm.c at 483 PS1, Line 483: * still the old lchan. */ > (use width of 120?) Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/assignment_fsm.c at 486 PS1, Line 486: /* Also we need to spare the RR assignment, so we jump forward > s/spare/skip Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c at 539 PS1, Line 539: goto abort; > to match the way I usually arranged these FSMs, you would: [?] Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c at 570 PS1, Line 570: gsm48_lchan_modify(lchan, info->chan_mode); > doing things after a state change is dangerous business, FSMs have often bitten me like that because [?] Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c at 894 PS1, Line 894: lchan_fsm_state_chg(LCHAN_ST_WAIT_RSL_MT_MODE_MODIFY_ACK); > same thing, rather place the sending action in the onenter function. [?] Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c at 922 PS1, Line 922: lchan_fsm_state_chg(LCHAN_ST_WAIT_RLL_RTP_ESTABLISH); > onenter Done https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c at 923 PS1, Line 923: lchan_rtp_fsm_start(lchan); > have you looked at the case where an lchan may already be an active voice call when the mode changes [?] I thought of this yes, but I think this is not a real life scenario. A voice call usually runs until it is terminated, I do not know a scenario where a voice call is modified back to signalling. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 01 Sep 2020 14:51:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:54:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 14:54:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add minimalistic AssignmentCommand In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 ) Change subject: library/GSM_RR_Types: add minimalistic AssignmentCommand ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 Gerrit-Change-Number: 19924 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 14:54:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:54:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 14:54:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: cosmetic: fix formatting in RrL3Union In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19925 ) Change subject: library/GSM_RR_Types: cosmetic: fix formatting in RrL3Union ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00bcc5ebb6e098f8ec4986a3dec7e6d7e31e12f8 Gerrit-Change-Number: 19925 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 14:54:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:55:01 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 1 Sep 2020 14:55:01 +0000 Subject: Change in osmo-msc[master]: Don't Store an SMS in the database when the ESME is not Bound In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19935 ) Change subject: Don't Store an SMS in the database when the ESME is not Bound ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19935/1/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/c/osmo-msc/+/19935/1/src/libmsc/gsm_04_11.c at 647 PS1, Line 647: This SMS got routed through SMPP or no receiver exists. : * In any case, we store it in the database for further processing. > This comment does not make sense then... Please look at https://osmocom.org/issues/2354 I think something confusing here is that we can be dealing with either an MO SMS or an MT SMS, (submitted via SMPP) the above comment was added for the case where the MSC does not know the destination address of an MT SMS, because the MS is not attached at this time. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Gerrit-Change-Number: 19935 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 01 Sep 2020 14:55:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:55:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 14:55:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_{chan_activ, imm_ass} In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 ) Change subject: BSC_Tests/hopping: add TC_fh_params_{chan_activ,imm_ass} ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib9218b61a2b0c0467340656e4b65a36b7b0ba302 Gerrit-Change-Number: 19910 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 14:55:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:56:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 14:56:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_assignment_cmd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 ) Change subject: BSC_Tests/hopping: add TC_fh_params_assignment_cmd ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id12509385b444c426f4af7a0cf0d46efe2cb0eda Gerrit-Change-Number: 19926 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 14:56:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 14:58:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 14:58:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_si4_cbch In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 ) Change subject: BSC_Tests/hopping: add TC_fh_params_si4_cbch ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Gerrit-Change-Number: 19927 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 14:58:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 15:01:08 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 1 Sep 2020 15:01:08 +0000 Subject: Change in osmo-trx[master]: Add support for TRXC MUTE command In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19828 ) Change subject: Add support for TRXC MUTE command ...................................................................... Patch Set 3: It should be pointed out everywhere that UL and DL burst processing will still continue, the device still has to drive the fifos just like during normal operation. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 Gerrit-Change-Number: 19828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 01 Sep 2020 15:01:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 15:10:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 15:10:57 +0000 Subject: Change in osmocom-bb[master]: fake_trx: Implement RFMUTE TRXC cmd In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19839 ) Change subject: fake_trx: Implement RFMUTE TRXC cmd ...................................................................... fake_trx: Implement RFMUTE TRXC cmd Change-Id: I67d16858cd70cb0527c1da77bd3787d5e53100b4 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/data_msg.py M src/target/trx_toolkit/fake_trx.py 4 files changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index dbaded6..0b69fe2 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -50,6 +50,10 @@ # so let's precalculate its Tx frequency in advance tx_freq = src_trx.get_tx_freq(rx_msg.fn) + if src_trx.rf_muted: + del rx_msg.burst # burst bits are omited + rx_msg.burst = None + # Iterate over all known transceivers for trx in self.trx_list: if trx == src_trx: diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index 0e5106a..ea08e7e 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -251,6 +251,13 @@ log.debug("(%s) Recv NOMTXPOWER cmd" % self.trx) return (0, [str(self.trx.tx_power_base)]) + # Lock/Unlock RF emission+reception + if self.verify_cmd(request, "RFMUTE", 1): + log.debug("(%s) Recv RFMUTE cmd" % self.trx) + # Parse the requested RFMUTE state (1=locked, 0=unlocked) + self.trx.rf_muted = int(request[1]) > 0 + return 0 + # Wrong / unknown command else: # We don't care about other commands, diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 88376ed..86670fc 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -413,6 +413,8 @@ # Convert burst bits if self.burst is not None: msg.burst = self.ubit2sbit(self.burst) + else: + msg.nope_ind = True return msg diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index ded8dc4..6f46473 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -125,6 +125,8 @@ # When disabled, RSSI is calculated based on Tx power and Rx path loss self.fake_rssi_enabled = False + self.rf_muted = False + # Actual ToA, RSSI, C/I, TA values self.tx_power_base = self.NOMINAL_TX_POWER_DEFAULT self.tx_att_base = self.TX_ATT_DEFAULT @@ -215,8 +217,11 @@ # simulates RF path parameters (such as RSSI), # and sends towards the L1 def handle_data_msg(self, src_trx, src_msg, msg): - # Path loss simulation - msg.nope_ind = self.sim_burst_drop(msg) + if self.rf_muted: + msg.nope_ind = True + elif not msg.nope_ind: + # Path loss simulation + msg.nope_ind = self.sim_burst_drop(msg) if msg.nope_ind: # Before TRXDv1, we simply drop the message if msg.ver < 0x01: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I67d16858cd70cb0527c1da77bd3787d5e53100b4 Gerrit-Change-Number: 19839 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 15:22:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 15:22:56 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c at 923 PS1, Line 923: lchan_rtp_fsm_start(lchan); > I thought of this yes, but I think this is not a real life scenario. [?] I would suppose there are such situations, let's say you start a USSD command just after ending a call, i.e. after the CC transaction is cleared, but before the actual readio channel is gone. The same probably would go for MT-USSD sessions that are started during a voice call but continue after the call is over. Not the most common scenario, but definitely plausible. Also, in terms of RTP: What if another voice call is just coming in before the old lchan is released? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 01 Sep 2020 15:22:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 15:23:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 15:23:56 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 01 Sep 2020 15:23:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:26:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:26:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add minimalistic AssignmentCommand In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 ) Change subject: library/GSM_RR_Types: add minimalistic AssignmentCommand ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 Gerrit-Change-Number: 19924 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 16:26:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:46:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:46:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_{chan_activ, imm_ass} In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 ) Change subject: BSC_Tests/hopping: add TC_fh_params_{chan_activ,imm_ass} ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib9218b61a2b0c0467340656e4b65a36b7b0ba302 Gerrit-Change-Number: 19910 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 16:46:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:46:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:46:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_assignment_cmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 ) Change subject: BSC_Tests/hopping: add TC_fh_params_assignment_cmd ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id12509385b444c426f4af7a0cf0d46efe2cb0eda Gerrit-Change-Number: 19926 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 16:46:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:47:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:47:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_si4_cbch In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 ) Change subject: BSC_Tests/hopping: add TC_fh_params_si4_cbch ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Gerrit-Change-Number: 19927 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 16:47:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:47:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:47:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add minimalistic AssignmentCommand In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 ) Change subject: library/GSM_RR_Types: add minimalistic AssignmentCommand ...................................................................... library/GSM_RR_Types: add minimalistic AssignmentCommand Unfortunately, the existing implementation [1] is somewhat incomplete and unfriendly to build templates on: - some fields holding integer numbers defined as BITx, so we would have to do bit2int() / int2bit(); - some bit-map fields defined as octetstrings; - some fields are not decoded at all (raw octetstrings). Let's work this around by defining a minimalistic implementation of (RR) Assignment Command with all mandatory and some optional fields. Reuse some IEs directly from MobileL3_RRM_Types. [1] titan.ProtocolModules.MobileL3_v13.4.0 MobileL3_RRM_Types.PDU_RRM_AssignmentCommand_NW_MS Change-Id: If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 Related: SYS#4868, OS#4545 --- M library/GSM_RR_Types.ttcn M sysinfo/gen_links.sh 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 59fe6d5..e4c0d57 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -17,6 +17,7 @@ import from GSM_Types all; import from RLCMAC_CSN1_Types all; import from MobileL3_CommonIE_Types all; + import from MobileL3_RRM_Types all; /* Table 10.4.1 of Section 10.4 / 3GPP TS 44.018 */ type enumerated RrMessageType { @@ -671,6 +672,29 @@ type record of NcellReport NcellReports; + /* 3GPP TS 44.018, section 9.1.2 (minimalistic implementation) */ + type record AssignmentCommand { + ChannelDescription chan_desc, + PowerCommand_V power_cmd, + FrequencyList_TLV freq_list_at optional, + CellChannelDescription_TV cell_chan_desc optional, + /* TODO: Multislot Allocation IE */ + ChannelMode_TV chan1_mode optional, + ChannelMode_TV chan2_mode optional, + /* TODO: Mode of Channel Set 3..8 IE */ + MobileAllocationTLV mobile_allocation optional + /* TODO: more optional IEs... */ + } with { + variant "TAG( + freq_list_at, elementIdentifier = '05'O; + cell_chan_desc, elementIdentifier = '62'O; + chan1_mode, elementIdentifier = '63'O; + chan2_mode, elementIdentifier = '11'O; + mobile_allocation, iei = '72'O; + )" + }; + + /* 9.1.18 */ type record ImmediateAssignment { DedicatedModeOrTbf ded_or_tbf, @@ -828,6 +852,7 @@ type union RrL3Union { PagingResponse paging_response, MeasurementReport meas_rep, + AssignmentCommand ass_cmd, octetstring other }; @@ -837,6 +862,7 @@ } with { variant (payload) "CROSSTAG( paging_response, header.message_type = PAGING_RESPONSE; meas_rep, header.message_type = MEASUREMENT_REPORT; + ass_cmd, header.message_type = ASSIGNMENT_COMMAND; other, OTHERWISE; )" } diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 0648e7b..fa3cd33 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -9,7 +9,7 @@ gen_links $DIR $FILES DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src -FILES="MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn" +FILES="MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn" gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 Gerrit-Change-Number: 19924 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:47:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:47:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: cosmetic: fix formatting in RrL3Union In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19925 ) Change subject: library/GSM_RR_Types: cosmetic: fix formatting in RrL3Union ...................................................................... library/GSM_RR_Types: cosmetic: fix formatting in RrL3Union Change-Id: I00bcc5ebb6e098f8ec4986a3dec7e6d7e31e12f8 --- M library/GSM_RR_Types.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index e4c0d57..c2c9d1b 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -850,10 +850,10 @@ } with { variant "" }; type union RrL3Union { - PagingResponse paging_response, - MeasurementReport meas_rep, - AssignmentCommand ass_cmd, - octetstring other + PagingResponse paging_response, + MeasurementReport meas_rep, + AssignmentCommand ass_cmd, + octetstring other }; type record GsmRrL3Message { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00bcc5ebb6e098f8ec4986a3dec7e6d7e31e12f8 Gerrit-Change-Number: 19925 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:47:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:47:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_{chan_activ, imm_ass} In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 ) Change subject: BSC_Tests/hopping: add TC_fh_params_{chan_activ,imm_ass} ...................................................................... BSC_Tests/hopping: add TC_fh_params_{chan_activ,imm_ass} This test case verifies presence and correctness of the hopping parameters in the following messages and their IEs: 1. RSL CHANnel ACTIVation 1.1. Channel Identification IE 2. RSL IMMEDIATE ASSIGN COMMAND 2.1. Channel Description IE 2.2. Mobile Allocation IE The hopping parameters are randomly generated and configured via the VTY interface in the beginning, and unset in the end. Change-Id: Ib9218b61a2b0c0467340656e4b65a36b7b0ba302 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 274 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4560957..309802f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6797,6 +6797,277 @@ chan_nr := rx_rsl.ies[0].body.chan_nr; f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 33)); rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); +} + +/* Hopping parameters per a timeslot */ +private type record length(0..64) of integer ArfcnList; +private type record FHParamsTs { + boolean enabled, + uint6_t hsn, + uint6_t maio, + ArfcnList ma +}; + +/* Hopping parameters per a transceiver */ +private type record length(8) of FHParamsTs FHParamsTrx; + +/* Randomly generate the hopping parameters for the given timeslot numbers */ +private function f_TC_fh_params_gen(template integer tr_tn := (1, 3, 5)) +runs on test_CT return FHParamsTrx { + var FHParamsTrx fhp; + + for (var integer tn := 0; tn < 8; tn := tn + 1) { + if (not match(tn, tr_tn)) { + fhp[tn].enabled := false; + fhp[tn].ma := { }; + continue; + } + + /* Random HSN / MAIO values: 0..63 */ + fhp[tn].hsn := f_rnd_int(64); + fhp[tn].maio := f_rnd_int(64); + fhp[tn].ma := { }; + + /* Random Mobile Allocation (hopping channels) */ + var integer ma_len := 2 + f_rnd_int(9); /* 2..10 channels */ + var integer step := 3 + f_rnd_int(4); /* 3..6 stepping */ + for (var integer i := 1; i <= ma_len; i := i + 1) { + fhp[tn].ma := fhp[tn].ma & { i * step }; + } + + fhp[tn].enabled := true; + } + + log("f_TC_fh_params_gen(): ", fhp); + return fhp; +} + +/* Make sure that the given Channel Description IE matches the hopping configuration */ +private function f_TC_fh_params_match_chan_desc(in FHParamsTrx fhp, in ChannelDescription cd) +{ + var template (present) ChannelDescription tr_cd; + var template (present) MaioHsn tr_maio_hsn; + var uint3_t tn := cd.chan_nr.tn; + + if (fhp[tn].enabled) { + tr_maio_hsn := tr_HsnMaio(fhp[tn].hsn, fhp[tn].maio); + tr_cd := tr_ChanDescH1(cd.chan_nr, tr_maio_hsn); + } else { + tr_cd := tr_ChanDescH0(cd.chan_nr); + } + + if (not match(cd, tr_cd)) { + setverdict(fail, "Channel Description IE does not match: ", + cd, " vs expected ", tr_cd); + } +} + +/* Make sure that the given Mobile Allocation IE matches the hopping configuration */ +private function f_TC_fh_params_match_ma(in FHParamsTrx fhp, uint3_t tn, + in MobileAllocationLV ma) +{ + var template MobileAllocationLV tr_ma := f_TC_fh_params_gen_tr_ma(fhp, tn, ma); + + if (not match(ma, tr_ma)) { + setverdict(fail, "Mobile Allocation IE does not match (tn := ", + tn, "): ", ma, " vs expected: ", tr_ma); + } else { + setverdict(pass); + } +} + +private function f_TC_fh_params_gen_tr_ma(in FHParamsTrx fhp, uint3_t tn, + in MobileAllocationLV ma) +return template MobileAllocationLV { + /* Mobile Allocation IE is expected to be empty if hopping is not enabled */ + if (not fhp[tn].enabled) { + return { len := 0, ma := ''B }; + } + + var bitstring full_mask := f_pad_bit(''B, 1024, '0'B); + var bitstring slot_mask := f_pad_bit(''B, 1024, '0'B); + var bitstring ma_mask := ''B; + var integer ma_mask_len := 0; + + /* Compose the full bit-mask (all channels, up to 1024 entries) */ + for (var integer i := 0; i < lengthof(fhp); i := i + 1) { + for (var integer j := 0; j < lengthof(fhp[i].ma); j := j + 1) { + if (full_mask[fhp[i].ma[j]] == '1'B) + { continue; } + full_mask[fhp[i].ma[j]] := '1'B; + } + } + + /* Compose a bit-mask for the given timeslot number */ + for (var integer i := 0; i < lengthof(fhp[tn].ma); i := i + 1) { + slot_mask[fhp[tn].ma[i]] := '1'B; + } + + /* Finally, compose the Mobile Allocation bit-mask */ + for (var integer i := 0; i < lengthof(full_mask); i := i + 1) { + if (full_mask[i] != '1'B) + { continue; } + + /* FIXME: ma_mask := ma_mask & slot_mask[i]; // triggers a bug in TITAN */ + if (slot_mask[i] == '1'B) { + ma_mask := ma_mask & '1'B; + ma_mask_len := lengthof(ma_mask); + } else { + ma_mask := ma_mask & '0'B; + } + } + + /* Ensure that ma_mask is octet-aligned */ + ma_mask := substr(ma_mask, 0, ma_mask_len + 1); + ma_mask_len := (ma_mask_len + 8 - 1) / 8; + ma_mask := f_pad_bit(ma_mask, ma_mask_len * 8, '0'B); + + return { len := ma_mask_len, ma := ma_mask }; +} + +/* Configure the hopping parameters in accordance with the given record */ +private function f_TC_fh_params_set(in FHParamsTrx fhp, + uint8_t bts_nr := 0, + uint8_t trx_nr := 0) +runs on test_CT { + /* Enter the configuration node for the given BTS/TRX numbers */ + f_vty_enter_cfg_trx(BSCVTY, bts_nr, trx_nr); + + for (var integer tn := 0; tn < lengthof(fhp); tn := tn + 1) { + f_vty_transceive(BSCVTY, "timeslot " & int2str(tn)); + + if (not fhp[tn].enabled) { + f_vty_transceive(BSCVTY, "hopping enabled 0"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + continue; + } + + /* Configure HSN / MAIO values */ + f_vty_transceive(BSCVTY, "hopping sequence-number " & int2str(fhp[tn].hsn)); + f_vty_transceive(BSCVTY, "hopping maio " & int2str(fhp[tn].maio)); + + /* Configure the Mobile Allocation (hopping channels) */ + for (var integer i := 0; i < lengthof(fhp[tn].ma); i := i + 1) { + f_vty_transceive(BSCVTY, "hopping arfcn add " & int2str(fhp[tn].ma[i])); + } + + f_vty_transceive(BSCVTY, "hopping enabled 1"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + } + + f_vty_transceive(BSCVTY, "end"); +} + +/* Disable frequency hopping on all timeslots */ +private function f_TC_fh_params_unset(in FHParamsTrx fhp, + uint8_t bts_nr := 0, + uint8_t trx_nr := 0) +runs on test_CT { + /* Enter the configuration node for the given BTS/TRX numbers */ + f_vty_enter_cfg_trx(BSCVTY, bts_nr, trx_nr); + + for (var integer tn := 0; tn < lengthof(fhp); tn := tn + 1) { + f_vty_transceive(BSCVTY, "timeslot " & int2str(tn)); + + /* Delete all ARFCNs from the Mobile Allocation (if any) */ + for (var integer i := 0; i < lengthof(fhp[tn].ma); i := i + 1) { + f_vty_transceive(BSCVTY, "hopping arfcn del " & int2str(fhp[tn].ma[i])); + } + + f_vty_transceive(BSCVTY, "hopping enabled 0"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + } + + f_vty_transceive(BSCVTY, "end"); + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); +} + +/* Verify presence and correctness of the hopping parameters (HSN, MAIO) + * in the Channel Identification IE of the RSL CHANnel ACTIVation message. */ +testcase TC_fh_params_chan_activ() runs on test_CT { + var FHParamsTrx fhp := f_TC_fh_params_gen(); + var RSL_Message rsl_msg; + var RSL_IE_Body ie; + + f_init_vty(); + + f_TC_fh_params_set(fhp); /* Enable frequency hopping */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1); + + /* CS domain: 3 (SDCCH/4+CBCH) + 4 (TCH/F) + 2 (TCH/H) channels available */ + for (var integer i := 0; i < 9; i := i + 1) { + f_ipa_tx(0, ts_RSL_CHAN_RQD(f_rnd_ra_cs(), 23)); + rsl_msg := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); + + /* Make sure that Channel Identification IE is present */ + if (not f_rsl_find_ie(rsl_msg, RSL_IE_CHAN_IDENT, ie)) { + setverdict(fail, "RSL Channel Identification IE is absent"); + continue; + } + + /* Make sure that hopping parameters (HSN/MAIO) match */ + f_TC_fh_params_match_chan_desc(fhp, ie.chan_ident.ch_desc.v); + + /* "Mobile Allocation shall be included but empty" - let's check this */ + if (ie.chan_ident.ma.v.len != 0) { + setverdict(fail, "Mobile Allocation IE is not empty: ", + ie.chan_ident.ma, ", despite it shall be"); + continue; + } + } + + /* Disable frequency hopping */ + f_TC_fh_params_unset(fhp); + + setverdict(pass); +} + +/* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Immediate Assignment */ +testcase TC_fh_params_imm_ass() runs on test_CT { + var FHParamsTrx fhp := f_TC_fh_params_gen(); + var RSL_Message rsl_msg; + var RSL_IE_Body ie; + + f_init_vty(); + + f_TC_fh_params_set(fhp); /* Enable frequency hopping */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1); + + /* CS domain: 3 (SDCCH/4+CBCH) + 4 (TCH/F) + 2 (TCH/H) channels available */ + for (var integer i := 0; i < 9; i := i + 1) { + f_ipa_tx(0, ts_RSL_CHAN_RQD(f_rnd_ra_cs(), 23)); + rsl_msg := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); + + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(rsl_msg.ies[0].body.chan_nr, 33)); + rsl_msg := f_exp_ipa_rx(0, tr_RSL_MsgTypeC(RSL_MT_IMMEDIATE_ASSIGN_CMD)); + + /* Make sure that Full Immediate Assign Info IE is present */ + if (not f_rsl_find_ie(rsl_msg, RSL_IE_FULL_IMM_ASS_INFO, ie)) { + setverdict(fail, "RSL Full Immediate Assign Info IE is absent"); + continue; + } + + /* Decode the actual Immediate Assignment message */ + var GsmRrMessage rr_msg := dec_GsmRrMessage(ie.full_imm_ass_info.payload); + if (not match(rr_msg.header, t_RrHeader(IMMEDIATE_ASSIGNMENT, ?))) { + setverdict(fail, "Failed to match Immediate Assignment: ", rr_msg); + continue; + } + + /* Make sure that hopping parameters (HSN/MAIO) match */ + f_TC_fh_params_match_chan_desc(fhp, rr_msg.payload.imm_ass.chan_desc); + + /* Make sure that the Mobile Allocation IE matches */ + f_TC_fh_params_match_ma(fhp, rr_msg.payload.imm_ass.chan_desc.chan_nr.tn, + rr_msg.payload.imm_ass.mobile_allocation); + } + + /* Disable frequency hopping */ + f_TC_fh_params_unset(fhp); setverdict(pass); } @@ -7029,6 +7300,9 @@ execute( TC_assignment_emerg_setup_deny_bts() ); execute( TC_emerg_premption() ); + /* Frequency hopping parameters handling */ + execute( TC_fh_params_chan_activ() ); + execute( TC_fh_params_imm_ass() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib9218b61a2b0c0467340656e4b65a36b7b0ba302 Gerrit-Change-Number: 19910 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:47:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:47:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_assignment_cmd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 ) Change subject: BSC_Tests/hopping: add TC_fh_params_assignment_cmd ...................................................................... BSC_Tests/hopping: add TC_fh_params_assignment_cmd This test case verifies presence and correctness of the hopping parameters in the following messages and their IEs: 1. (RR) Assignment Command 1.1. Description of the First Channel, after time IE 1.2. Mobile Allocation, after time IE Change-Id: Id12509385b444c426f4af7a0cf0d46efe2cb0eda Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 80 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 309802f..d0719a9 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7072,6 +7072,85 @@ setverdict(pass); } +/* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Assignment Command */ +testcase TC_fh_params_assignment_cmd() runs on test_CT { + var FHParamsTrx fhp := f_TC_fh_params_gen(); + var RSL_Message rsl_msg; + var RSL_IE_Body ie; + + f_init_vty(); + + f_TC_fh_params_set(fhp); /* Enable frequency hopping */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1); + + /* HACK: work around "Couldn't find Expect for CRCX" */ + vc_MGCP.stop; + + var template PDU_BSSAP ass_cmd := f_gen_ass_req(); + ass_cmd.pdu.bssmap.assignmentRequest.codecList := ts_BSSMAP_IE_CodecList({ts_CodecFR}); + + /* CS domain (TCH): 4 (TCH/F) + 2 (TCH/H) channels available + * NOTE: only 3 SDCCH/4 channels are available on CCCH+SDCCH4+CBCH */ + for (var integer i := 0; i < 3; i := i + 1) { + /* Establish a dedicated channel, so we can trigger (late) TCH assignment */ + var DchanTuple dt := f_est_dchan(f_rnd_ra_cs(), 23, f_rnd_octstring(16)); + + /* Send a BSSMAP Assignment Command, expect CHANnel ACTIVation */ + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ass_cmd)); + rsl_msg := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); + + /* ACKnowledge CHANnel ACTIVation, expect RSL DATA REQuest */ + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(rsl_msg.ies[0].body.chan_nr, 33)); + rsl_msg := f_exp_ipa_rx(0, tr_RSL_MsgTypeR(RSL_MT_DATA_REQ)); + + /* Make sure that L3 Information IE is present */ + if (not f_rsl_find_ie(rsl_msg, RSL_IE_L3_INFO, ie)) { + setverdict(fail, "RSL L3 Information IE is absent"); + continue; + } + + /* Decode the L3 message and make sure it is (RR) Assignment Command */ + var GsmRrL3Message l3_msg := dec_GsmRrL3Message(ie.l3_info.payload); + if (not match(l3_msg.header, t_RrL3Header(ASSIGNMENT_COMMAND))) { + setverdict(fail, "Failed to match Assignment Command: ", l3_msg); + continue; + } + + /* Make sure that hopping parameters (HSN/MAIO) match */ + var ChannelDescription chan_desc := l3_msg.payload.ass_cmd.chan_desc; + f_TC_fh_params_match_chan_desc(fhp, chan_desc); + + /* Make sure that Cell Channel Description IE is present if FH is enabled */ + if (chan_desc.h and not ispresent(l3_msg.payload.ass_cmd.cell_chan_desc)) { + setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); + continue; + } + + /* Make sure that the Mobile Allocation IE matches (if present) */ + var boolean ma_present := ispresent(l3_msg.payload.ass_cmd.mobile_allocation); + if (chan_desc.h and ma_present) { + f_TC_fh_params_match_ma(fhp, chan_desc.chan_nr.tn, + l3_msg.payload.ass_cmd.mobile_allocation.v); + } else if (chan_desc.h and not ma_present) { + setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); + continue; + } else if (not chan_desc.h and ma_present) { + setverdict(fail, "FH disabled, but Mobile Allocation IE is present"); + continue; + } + } + + /* Give the IUT some time to release all channels */ + f_sleep(3.0); + + /* Disable frequency hopping */ + f_TC_fh_params_unset(fhp); + + setverdict(pass); +} + /* Dyn PDCH todo: * activate OSMO as TCH/F * activate OSMO as TCH/H @@ -7303,6 +7382,7 @@ /* Frequency hopping parameters handling */ execute( TC_fh_params_chan_activ() ); execute( TC_fh_params_imm_ass() ); + execute( TC_fh_params_assignment_cmd() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id12509385b444c426f4af7a0cf0d46efe2cb0eda Gerrit-Change-Number: 19926 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:47:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:47:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_si4_cbch In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 ) Change subject: BSC_Tests/hopping: add TC_fh_params_si4_cbch ...................................................................... BSC_Tests/hopping: add TC_fh_params_si4_cbch This test case verifies presence and correctness of the hopping parameters in (RR) System Information Type 4 (CBCH description). Since the C0/TS0 (BCCH+SDCCH4+CBCH) shall not be hopping, let's temporarily re-configure TS0 as BCCH, and TS1 as SDCCH8+CBCH. According to 3GPP TS 44.018, section 9.1.36.1, if CBCH is active in the cell, the CBCH Channel Description IE indicates where to find it (physical channel description). According to section 9.1.36.2, the CBCH Mobile Allocation IE shall be included if CBCH Channel Description IE indicates that frequency hopping is in use. Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 80 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d0719a9..0099d5a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7151,6 +7151,85 @@ setverdict(pass); } +/* Verify the hopping parameters in System Information Type 4 */ +testcase TC_fh_params_si4_cbch() runs on test_CT { + var FHParamsTrx fhp := f_TC_fh_params_gen(tr_tn := 1); + var ASP_RSL_Unitdata rx_rsl_ud; + timer T := 5.0; + + f_init_vty(); + + /* (Re)configure TS0 as BCCH and TS1 as SDCCH8+CBCH */ + f_vty_enter_cfg_trx(BSCVTY, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config sdcch8+cbch"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + f_TC_fh_params_set(fhp); /* Enable frequency hopping */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1); + + T.start; + alt { + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_BCCH_INFO(RSL_SYSTEM_INFO_4))) -> value rx_rsl_ud { + var RSL_IE_Body ie := rx_rsl_ud.rsl.ies[2].body; /* FULL BCCH Information IE */ + var SystemInformation si := dec_SystemInformation(ie.other.payload); + + /* Make sure that what we decoded is System Information Type 4 */ + if (si.header.message_type != SYSTEM_INFORMATION_TYPE_4) { + setverdict(fail, "RSL FULL BCCH Information IE contains: ", si); + repeat; + } + + /* Make sure that CBCH Channel Description IE is present */ + if (not ispresent(si.payload.si4.cbch_chan_desc)) { + setverdict(fail, "CBCH Channel Description IE is absent"); + break; + } + + /* Finally, check the hopping parameters (HSN, MAIO) */ + var ChannelDescription chan_desc := si.payload.si4.cbch_chan_desc.v; + f_TC_fh_params_match_chan_desc(fhp, chan_desc); + + /* 3GPP TS 44.018, section 9.1.36.2 "CBCH Mobile Allocation": + * The CBCH Mobile Allocation IE *shall* be present if FH is enabled. */ + if (chan_desc.h and not ispresent(si.payload.si4.cbch_mobile_alloc)) { + setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); + break; + } else if (chan_desc.h and ispresent(si.payload.si4.cbch_mobile_alloc)) { + f_TC_fh_params_match_ma(fhp, chan_desc.chan_nr.tn, + si.payload.si4.cbch_mobile_alloc.v); + } + } + [] IPA_RSL[0].receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for RSL BCCH INFOrmation (SI4)"); + } + } + + /* Disable frequency hopping */ + f_TC_fh_params_unset(fhp); + + /* (Re)configure TS0 as CCCH+SDCCH4 and TS1 as TCH/F */ + f_vty_enter_cfg_trx(BSCVTY, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config tch/f"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + setverdict(pass); +} + /* Dyn PDCH todo: * activate OSMO as TCH/F * activate OSMO as TCH/H @@ -7383,6 +7462,7 @@ execute( TC_fh_params_chan_activ() ); execute( TC_fh_params_imm_ass() ); execute( TC_fh_params_assignment_cmd() ); + execute( TC_fh_params_si4_cbch() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Gerrit-Change-Number: 19927 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:48:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:48:05 +0000 Subject: Change in osmo-bsc[master]: vty: Hide show running-config ACC ramping params if not enabled In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19934 ) Change subject: vty: Hide show running-config ACC ramping params if not enabled ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I759eb0c31dd3c9b6f5f3d2bf57c6efc9ac5f74f1 Gerrit-Change-Number: 19934 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 01 Sep 2020 16:48:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:48:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:48:07 +0000 Subject: Change in osmo-bsc[master]: vty: Hide show running-config ACC ramping params if not enabled In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19934 ) Change subject: vty: Hide show running-config ACC ramping params if not enabled ...................................................................... vty: Hide show running-config ACC ramping params if not enabled If the feature is not enabled there's no real use in displaying default values for it. Related: SYS#4912 Change-Id: I759eb0c31dd3c9b6f5f3d2bf57c6efc9ac5f74f1 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index fc7dd16..ef10c49 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -955,12 +955,14 @@ if (bts->acc_mgr.rotation_time_sec != ACC_MGR_QUANTUM_DEFAULT) vty_out(vty, " access-control-class-rotate-quantum %" PRIu32 "%s", bts->acc_mgr.rotation_time_sec, VTY_NEWLINE); vty_out(vty, " %saccess-control-class-ramping%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "no ", VTY_NEWLINE); - vty_out(vty, " access-control-class-ramping-step-interval %u%s", - acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); - vty_out(vty, " access-control-class-ramping-step-size %u%s", acc_ramp_get_step_size(&bts->acc_ramp), - VTY_NEWLINE); - vty_out(vty, " access-control-class-ramping-chan-load %u %u%s", - bts->acc_ramp.chan_load_lower_threshold, bts->acc_ramp.chan_load_upper_threshold, VTY_NEWLINE); + if (acc_ramp_is_enabled(&bts->acc_ramp)) { + vty_out(vty, " access-control-class-ramping-step-interval %u%s", + acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); + vty_out(vty, " access-control-class-ramping-step-size %u%s", acc_ramp_get_step_size(&bts->acc_ramp), + VTY_NEWLINE); + vty_out(vty, " access-control-class-ramping-chan-load %u %u%s", + bts->acc_ramp.chan_load_lower_threshold, bts->acc_ramp.chan_load_upper_threshold, VTY_NEWLINE); + } if (!bts->si_unused_send_empty) vty_out(vty, " no system-information unused-send-empty%s", VTY_NEWLINE); for (i = SYSINFO_TYPE_1; i < _MAX_SYSINFO_TYPE; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I759eb0c31dd3c9b6f5f3d2bf57c6efc9ac5f74f1 Gerrit-Change-Number: 19934 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:49:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:49:00 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow submitting and parsing IPv6 addr in SDP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19888 ) Change subject: mgcp_client: Allow submitting and parsing IPv6 addr in SDP ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I936bf57d37f5f0607dfe7fc66c37e424c3793f9b Gerrit-Change-Number: 19888 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 16:49:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:50:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:50:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow setting IPv6 addresses In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19916 ) Change subject: mgcp_client: Allow setting IPv6 addresses ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19916/1/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19916/1/src/libosmo-mgcp-client/mgcp_client_vty.c at 53 PS1, Line 53: "mg this is a deprecated alias for backwards compatibility. By defiition it does not need to be extended with new features. https://gerrit.osmocom.org/c/osmo-mgw/+/19916/1/src/libosmo-mgcp-client/mgcp_client_vty.c at 88 PS1, Line 88: "mgcpgw remote-ip " VTY_IPV46_CMD, likewise here. Let's not change those deprecated aliases. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f Gerrit-Change-Number: 19916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 01 Sep 2020 16:50:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 16:50:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 1 Sep 2020 16:50:36 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19920 ) Change subject: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1be6f3b71486ce1782ba6b8c62f25145b42ec894 Gerrit-Change-Number: 19920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 01 Sep 2020 16:50:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 18:19:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 18:19:44 +0000 Subject: Change in osmo-bsc[master]: Fail on invalid IP addresses passed to IPACC MDCX References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19936 ) Change subject: Fail on invalid IP addresses passed to IPACC MDCX ...................................................................... Fail on invalid IP addresses passed to IPACC MDCX IPACC protocol supports only IPv4 addresses, so make sure if an IPv6 address (or whatever malformed address) is caught is not sent without noticing. Prior to this patch, faulty addresses would be sent over the wire as 255.255.255.255 (-1 returned from inet_addr()). Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/19936/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 1fe5452..736013c 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -330,6 +330,7 @@ int rc; struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); const struct mgcp_conn_peer *mgw_rtp; + struct in_addr sin; if (lchan->release.requested) { lchan_rtp_fail("Release requested while activating"); @@ -344,8 +345,13 @@ return; } - /* Other RTP settings were already setup in lchan_rtp_fsm_wait_ipacc_crcx_ack_onenter() */ - lchan->abis_ip.connect_ip = ntohl(inet_addr(mgw_rtp->addr)); + /* Other RTP settings were already set up in lchan_rtp_fsm_wait_ipacc_crcx_ack_onenter() */ + if (inet_pton(AF_INET, mgw_rtp->addr, &sin) != 1) { + /* Only IPv4 addresses are supported in IPACC */ + lchan_rtp_fail("Invalid remote IPv4 address %", mgw_rtp->addr); + return; + } + lchan->abis_ip.connect_ip = ntohl(sin.s_addr); lchan->abis_ip.connect_port = mgw_rtp->port; /* send-recv */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 Gerrit-Change-Number: 19936 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 18:34:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 18:34:21 +0000 Subject: Change in osmo-bsc[master]: Fail on invalid IP addresses passed to IPACC MDCX In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19936 to look at the new patch set (#2). Change subject: Fail on invalid IP addresses passed to IPACC MDCX ...................................................................... Fail on invalid IP addresses passed to IPACC MDCX IPACC protocol supports only IPv4 addresses, so make sure if an IPv6 address (or whatever malformed address) is caught is not sent without noticing. Prior to this patch, faulty addresses would be sent over the wire as 255.255.255.255 (-1 returned from inet_addr()). Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/19936/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 Gerrit-Change-Number: 19936 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 18:55:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 18:55:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow setting IPv6 addresses In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19916 to look at the new patch set (#2). Change subject: mgcp_client: Allow setting IPv6 addresses ...................................................................... mgcp_client: Allow setting IPv6 addresses Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f --- M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.c 2 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/16/19916/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f Gerrit-Change-Number: 19916 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 18:59:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 18:59:42 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local a... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19933 ) Change subject: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local address ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic2b608a055635f94d74cc24c3a934d6458934e82 Gerrit-Change-Number: 19933 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Sep 2020 18:59:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 19:00:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 1 Sep 2020 19:00:52 +0000 Subject: Change in osmo-trx[master]: Add support for TRXC MUTE command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19828 ) Change subject: Add support for TRXC MUTE command ...................................................................... Patch Set 3: > Patch Set 3: > > It should be pointed out everywhere that UL and DL burst processing will still continue, the device still has to drive the fifos just like during normal operation. I'll add that to the commit in osmo-gsm-manuals.git where the protocol is specified, no need to add it here in some random place. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 Gerrit-Change-Number: 19828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 01 Sep 2020 19:00:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 20:26:45 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 1 Sep 2020 20:26:45 +0000 Subject: Change in osmo-gsm-tester[master]: srs{ue, enb}.conf.tmpl: remove restriction of PHY threads for ZMQ In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19857 ) Change subject: srs{ue,enb}.conf.tmpl: remove restriction of PHY threads for ZMQ ...................................................................... srs{ue,enb}.conf.tmpl: remove restriction of PHY threads for ZMQ we now support any number of PHY threads also with ZMQ operation Change-Id: I31abfce742f757179fbfe4099cd0a934db4e63d7 --- M src/osmo_gsm_tester/templates/srsenb.conf.tmpl M src/osmo_gsm_tester/templates/srsue.conf.tmpl 2 files changed, 4 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl index b58db53..81753d6 100644 --- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl @@ -249,7 +249,7 @@ # # pusch_max_its: Maximum number of turbo decoder iterations (Default 4) # pusch_8bit_decoder: Use 8-bit for LLR representation and turbo decoder trellis computation (Experimental) -# nof_phy_threads: Selects the number of PHY threads (maximum 4, minimum 1, default 2) +# nof_phy_threads: Selects the number of PHY threads (maximum 4, minimum 1, default 3) # metrics_period_secs: Sets the period at which metrics are requested from the eNB. # metrics_csv_enable: Write eNB metrics to CSV file. # metrics_csv_filename: File path to use for CSV metrics. @@ -265,9 +265,7 @@ [expert] #pusch_max_its = 8 # These are half iterations #pusch_8bit_decoder = false -% if enb.get('rf_dev_type') == 'zmq': -nof_phy_threads = 1 -% endif +#nof_phy_threads = 3 #metrics_period_secs = 1 #metrics_csv_enable = false #metrics_csv_filename = /tmp/enb_metrics.csv diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index 3a43f17..05c6c55 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -293,7 +293,7 @@ # refs: use difference between noise references and noiseless (after filtering) # empty: use empty subcarriers in the boarder of pss/sss signal # pdsch_max_its: Maximum number of turbo decoder iterations (Default 4) -# nof_phy_threads: Selects the number of PHY threads (maximum 4, minimum 1, default 2) +# nof_phy_threads: Selects the number of PHY threads (maximum 4, minimum 1, default 3) # equalizer_mode: Selects equalizer mode. Valid modes are: "mmse", "zf" or any # non-negative real number to indicate a regularized zf coefficient. # Default is MMSE. @@ -331,9 +331,7 @@ #snr_ema_coeff = 0.1 #snr_estim_alg = refs #pdsch_max_its = 8 # These are half iterations -% if ue.get('rf_dev_type') == 'zmq': -nof_phy_threads = 1 -% endif +#nof_phy_threads = 3 #equalizer_mode = mmse #sfo_ema = 0.1 #sfo_correct_period = 10 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I31abfce742f757179fbfe4099cd0a934db4e63d7 Gerrit-Change-Number: 19857 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 20:26:46 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 1 Sep 2020 20:26:46 +0000 Subject: Change in osmo-gsm-tester[master]: enb_srs: add sleep after stopping srsENB to allow log flush In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19858 ) Change subject: enb_srs: add sleep after stopping srsENB to allow log flush ...................................................................... enb_srs: add sleep after stopping srsENB to allow log flush add similar concept used in the UE to allow the process to flush the logs Change-Id: I9f8341869f89cd7ae845072b9da4f6070fa2d242 --- M src/osmo_gsm_tester/obj/enb_srs.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index a945319..aa2ec87 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -21,6 +21,7 @@ import pprint from ..core import log, util, config, template, process, remote +from ..core.event_loop import MainLoop from . import enb from . import rfemu from .srslte_common import srslte_common @@ -70,6 +71,7 @@ self.remote_pcap_file = None self.enable_pcap = False self.metrics_file = None + self.stop_sleep_time = 6 # We require at most 5s to stop self.testenv = testenv self._additional_args = [] if not rf_type_valid(conf.get('rf_dev_type', None)): @@ -80,6 +82,10 @@ return if self._run_node.is_local(): return + + # Make sure we give the UE time to tear down + self.sleep_after_stop() + # copy back files (may not exist, for instance if there was an early error of process): try: self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file) @@ -94,6 +100,12 @@ # Collect KPIs for each TC self.testenv.test().set_kpis(self.get_kpis()) + def sleep_after_stop(self): + # Only sleep once + if self.stop_sleep_time > 0: + MainLoop.sleep(self.stop_sleep_time) + self.stop_sleep_time = 0 + def start(self, epc): self.log('Starting srsENB') self._epc = epc -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9f8341869f89cd7ae845072b9da4f6070fa2d242 Gerrit-Change-Number: 19858 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 20:26:46 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 1 Sep 2020 20:26:46 +0000 Subject: Change in osmo-gsm-tester[master]: rfemu_amarisoft: handle exception and log event if WS is closed In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19859 ) Change subject: rfemu_amarisoft: handle exception and log event if WS is closed ...................................................................... rfemu_amarisoft: handle exception and log event if WS is closed the WS is closed if the eNB process dies. this patch will log an event but not stop the experiment. Change-Id: I0fafc7e38954400540375d51813e96500700f50c --- M src/osmo_gsm_tester/obj/rfemu_amarisoftctrl.py 1 file changed, 9 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/rfemu_amarisoftctrl.py b/src/osmo_gsm_tester/obj/rfemu_amarisoftctrl.py index 17aa43a..585166a 100644 --- a/src/osmo_gsm_tester/obj/rfemu_amarisoftctrl.py +++ b/src/osmo_gsm_tester/obj/rfemu_amarisoftctrl.py @@ -53,11 +53,15 @@ def set_attenuation(self, db): msg = { "message": "cell_gain", "cell_id": int(self.cell_id), "gain": -db } msg_str = json.dumps(msg) - self.dbg('sending CTRL msg: "%s"' % msg_str) - self.ws.send(msg_str) - self.dbg('waiting CTRL recv...') - result = self.ws.recv() - self.dbg('Received CTRL msg: "%s"' % result) + try: + self.dbg('sending CTRL msg: "%s"' % msg_str) + self.ws.send(msg_str) + self.dbg('waiting CTRL recv...') + result = self.ws.recv() + self.dbg('Received CTRL msg: "%s"' % result) + except Exception: + log.Error('Error sending CTLR msg to eNB. eNB still running?') + pass def get_max_attenuation(self): return 200 # maximum cell_gain value in Amarisoft -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I0fafc7e38954400540375d51813e96500700f50c Gerrit-Change-Number: 19859 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 20:26:46 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 1 Sep 2020 20:26:46 +0000 Subject: Change in osmo-gsm-tester[master]: srsenb_rr.conf.tmpl: reduce PUCCH PRBs for SR and CQI to 1 In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19860 ) Change subject: srsenb_rr.conf.tmpl: reduce PUCCH PRBs for SR and CQI to 1 ...................................................................... srsenb_rr.conf.tmpl: reduce PUCCH PRBs for SR and CQI to 1 this gives higher UL throughput because less resources are reserved for SR/CQI. For more users we may have to make the value configurable again. Change-Id: If6c313a1deafffda26e9effeb807ca71064c46bc --- M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl index 2e25f6b..cc1b894 100644 --- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl @@ -39,11 +39,7 @@ subframe = [1, 11, 21, 31]; // vector of subframe indices allowed for SR transmissions // number of PRBs on each extreme used for SR (total prb is twice this number) -% if int(enb['num_prb']) <= 6: nof_prb = 1; -% else: - nof_prb = 2; -% endif }; cqi_report_cnfg = { @@ -51,11 +47,7 @@ simultaneousAckCQI = true; period = 40; // in ms subframe = [0, 10, 20, 30]; -% if int(enb['num_prb']) <= 6: nof_prb = 1; -% else: - nof_prb = 2; -% endif m_ri = 8; // RI period in CQI period }; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If6c313a1deafffda26e9effeb807ca71064c46bc Gerrit-Change-Number: 19860 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 20:26:47 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 1 Sep 2020 20:26:47 +0000 Subject: Change in osmo-gsm-tester[master]: enb: expose RRC inactivity timer In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19861 ) Change subject: enb: expose RRC inactivity timer ...................................................................... enb: expose RRC inactivity timer allow the user to specifiy the RRC inactiviy timer used in the eNB. set the default value to 20s Change-Id: I6a264b8dee893b883d40a48831cbb47eb15e1e7b --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M src/osmo_gsm_tester/templates/srsenb.conf.tmpl M sysmocom/defaults.conf 4 files changed, 6 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index be48887..85aca35 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -35,6 +35,7 @@ 'rf_dev_type': schema.STR, 'rf_dev_args': schema.STR, 'additional_args[]': schema.STR, + 'inactivity_timer': schema.INT, 'enable_measurements': schema.BOOL_STR, 'enable_dl_awgn': schema.BOOL_STR, 'dl_awgn_snr': schema.INT, @@ -99,6 +100,8 @@ self._txmode = int(values['enb'].get('transmission_mode', None)) assert self._txmode config.overlay(values, dict(enb={ 'num_ports': self.num_ports() })) + self._inactivity_timer = int(values['enb'].get('inactivity_timer', None)) + assert self._inactivity_timer assert self._epc is not None config.overlay(values, dict(enb={ 'addr': self.addr() })) config.overlay(values, dict(enb={ 'mme_addr': self._epc.addr() })) diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 155ad47..2893b9e 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -223,7 +223,7 @@ /* (in ms) send RRC connection release after this time of network inactivity */ - inactivity_timer: 10000, + inactivity_timer: ${enb.inactivity_timer}, /* SRB configuration */ srb_config: [ diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl index 81753d6..ac94313 100644 --- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl @@ -272,7 +272,7 @@ #pregenerate_signals = false #tx_amplitude = 0.6 #link_failure_nof_err = 50 -rrc_inactivity_timer = 5000 +rrc_inactivity_timer = ${enb.inactivity_timer} #max_prach_offset_us = 30 #eea_pref_list = EEA0, EEA2, EEA1 #eia_pref_list = EIA2, EIA1, EIA0 diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index dd97456..2f2e317 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -112,6 +112,7 @@ mnc: 70 transmission_mode: 1 num_cells: 1 + inactivity_timer: 20000 enable_measurements: false enable_dl_awgn: false dl_awgn_snr: 30 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6a264b8dee893b883d40a48831cbb47eb15e1e7b Gerrit-Change-Number: 19861 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 20:26:47 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 1 Sep 2020 20:26:47 +0000 Subject: Change in osmo-gsm-tester[master]: ms_srs: trim leading zeros in UE metrics when calculating min_rolling... In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19862 ) Change subject: ms_srs: trim leading zeros in UE metrics when calculating min_rolling_avg ...................................................................... ms_srs: trim leading zeros in UE metrics when calculating min_rolling_avg this avoids a false negative detection when the UE attach takes a bit longer and the first seconds all zeros are reported in the CSV the HO test, for example, would fail in such a case as it expects no zero TP over the course of the experiment. Change-Id: I96dab17bb19249504dedda6659aed5eac0a65a26 --- M src/osmo_gsm_tester/obj/ms_srs.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index 124b113..1c0f728 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -460,6 +460,8 @@ # calculate rolling average over window and take maximum value result = numpy.amax(numpy.convolve(sel_data, numpy.ones((window,))/window, mode='valid')) elif operation == 'min_rolling_avg': + # trim leading zeros to avoid false negative when UE attach takes longer + sel_data = numpy.trim_zeros(sel_data, 'f') # calculate rolling average over window and take minimum value result = numpy.amin(numpy.convolve(sel_data, numpy.ones((window,))/window, mode='valid')) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I96dab17bb19249504dedda6659aed5eac0a65a26 Gerrit-Change-Number: 19862 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 1 20:26:47 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 1 Sep 2020 20:26:47 +0000 Subject: Change in osmo-gsm-tester[master]: 4g: consider number of component carriers for max rate calculation In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19863 ) Change subject: 4g: consider number of component carriers for max rate calculation ...................................................................... 4g: consider number of component carriers for max rate calculation when carrier aggregation is enabled we need to multiply the max rate of a single carrier with the number of carriers to get the actual achievable rate Change-Id: I70d850c0996ed461d3733e911adc33f3554c297c --- M sysmocom/suites/4g/iperf3_dl.py M sysmocom/suites/4g/iperf3_ul.py 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py index 26df79b..0d8bfcd 100755 --- a/sysmocom/suites/4g/iperf3_dl.py +++ b/sysmocom/suites/4g/iperf3_dl.py @@ -21,6 +21,7 @@ ue.connect(enb) max_rate = enb.ue_max_rate(downlink=True) +max_rate *= ue.num_carriers iperf3srv.start() proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate) diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py index 15cde95..83ac465 100755 --- a/sysmocom/suites/4g/iperf3_ul.py +++ b/sysmocom/suites/4g/iperf3_ul.py @@ -21,6 +21,7 @@ ue.connect(enb) max_rate = enb.ue_max_rate(downlink=False) +max_rate *= ue.num_carriers iperf3srv.start() proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I70d850c0996ed461d3733e911adc33f3554c297c Gerrit-Change-Number: 19863 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Sep 2 01:39:11 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 02 Sep 2020 01:39:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f4ef7ce6ebca_1f162ad89e2926008247f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 156s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 157s] [COMPILING libboard/qmod/source/card_pres.c] [ 157s] [COMPILING libboard/qmod/source/wwan_led.c] [ 157s] [COMPILING libboard/qmod/source/i2c.c] [ 157s] [COMPILING libboard/qmod/source/board_qmod.c] [ 157s] [COMPILING apps/dfu/main.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 158s] Memory region Used Size Region Size %age Used [ 158s] rom: 16588 B 16 KB 101.25% [ 158s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 158s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 158s] collect2: error: ld returned 1 exit status [ 158s] % [ 158s] make[2]: *** [Makefile:234: flash] Error 1 [ 158s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 158s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 158s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 158s] dh_auto_build: error: make -j1 returned exit code 2 [ 158s] make: *** [debian/rules:16: build] Error 25 [ 158s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 158s] ### VM INTERACTION START ### [ 162s] [ 153.077079] sysrq: Power Off [ 162s] [ 153.094844] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] old-atreju3 failed "build simtrace2_0.7.0.63.39070.dsc" at Wed Sep 2 01:38:56 UTC 2020. [ 162s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Sep 2 03:11:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 03:11:07 +0000 Subject: Change in osmo-bsc[master]: Fail on invalid IP addresses passed to IPACC MDCX In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19936 ) Change subject: Fail on invalid IP addresses passed to IPACC MDCX ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 Gerrit-Change-Number: 19936 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 02 Sep 2020 03:11:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 04:39:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 04:39:32 +0000 Subject: Change in libosmo-netif[master]: stream: add missing Doxygen \return statements to non-void functions References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/19937 ) Change subject: stream: add missing Doxygen \return statements to non-void functions ...................................................................... stream: add missing Doxygen \return statements to non-void functions Change-Id: I693939946497ad08f45cab238a56ceee29578056 --- M src/stream.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/37/19937/1 diff --git a/src/stream.c b/src/stream.c index 5f171ea..fc51a49 100644 --- a/src/stream.c +++ b/src/stream.c @@ -289,6 +289,7 @@ /*! \brief Check if Osmocom Stream Client is in connected state * \param[in] cli Osmocom Stream Client + * \return true if connected, false otherwise */ bool osmo_stream_cli_is_connected(struct osmo_stream_cli *cli) { @@ -429,7 +430,9 @@ /*! \brief Create an Osmocom stream client * \param[in] ctx talloc context from which to allocate memory * This function allocates a new \ref osmo_stream_cli and initializes - * it with default values (5s reconnect timer, TCP protocol) */ + * it with default values (5s reconnect timer, TCP protocol) + * \return allocated stream client, or NULL in case of error + */ struct osmo_stream_cli *osmo_stream_cli_create(void *ctx) { struct osmo_stream_cli *cli; @@ -644,6 +647,7 @@ * Open connection of an Osmocom stream client * \param[in] cli Stream Client to connect * \param[in] reconect 1 if we should not automatically reconnect + * \return negative on error, 0 on success */ int osmo_stream_cli_open2(struct osmo_stream_cli *cli, int reconnect) { @@ -716,7 +720,8 @@ /*! \brief Open connection of an Osmocom stream client * By default the client will automatically reconnect after default timeout. * To disable this, use osmo_stream_cli_set_reconnect_timeout() before calling this function. - * \param[in] cli Stream Client to connect */ + * \param[in] cli Stream Client to connect + * \return negative on error, 0 on success */ int osmo_stream_cli_open(struct osmo_stream_cli *cli) { int ret; @@ -1044,7 +1049,8 @@ /*! \brief Open the stream server link. This actually initializes the * underlying socket and binds it to the configured ip/port - * \param[in] link Stream Server Link to open */ + * \param[in] link Stream Server Link to open + * \return negative on error, 0 on success */ int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { int ret; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/19937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I693939946497ad08f45cab238a56ceee29578056 Gerrit-Change-Number: 19937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 09:36:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 09:36:35 +0000 Subject: Change in osmo-bts[master]: osmo-bts-omldummy: enable BTS_FEAT_{CBCH, HOPPING} support References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19938 ) Change subject: osmo-bts-omldummy: enable BTS_FEAT_{CBCH,HOPPING} support ...................................................................... osmo-bts-omldummy: enable BTS_FEAT_{CBCH,HOPPING} support Otherwise osmo-bts-omldummy would reject OML Set Channel Attributes containing the hopping parameters. This change is needed for the new BSC_Tests.TC_fh_params_* test cases. Change-Id: I38692252baa7a9fc23078121db0a17557950e4d4 Related: SYS#4868, OS#4545 --- M src/osmo-bts-omldummy/bts_model.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/19938/1 diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 3fd927d..0c66934 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -177,6 +177,8 @@ int bts_model_init(struct gsm_bts *bts) { bts->variant = BTS_OSMO_OMLDUMMY; + osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); + osmo_bts_set_feature(bts->features, BTS_FEAT_HOPPING); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I38692252baa7a9fc23078121db0a17557950e4d4 Gerrit-Change-Number: 19938 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 09:57:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 09:57:07 +0000 Subject: Change in osmo-bts[master]: osmo-bts-omldummy: enable BTS_FEAT_{CBCH, HOPPING} support In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19938 ) Change subject: osmo-bts-omldummy: enable BTS_FEAT_{CBCH,HOPPING} support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I38692252baa7a9fc23078121db0a17557950e4d4 Gerrit-Change-Number: 19938 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 02 Sep 2020 09:57:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:21:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:21:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19887 ) Change subject: mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib778e9a72764103b52a462ea3c7fb56b23c1bcd6 Gerrit-Change-Number: 19887 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:21:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:22:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:22:27 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow setting IPv6 addresses In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19916 ) Change subject: mgcp_client: Allow setting IPv6 addresses ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f Gerrit-Change-Number: 19916 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:22:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:24:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:24:05 +0000 Subject: Change in osmo-bsc[master]: Fix creating MGCP proxy socket if MGW listens on an IPv6 address In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19921 ) Change subject: Fix creating MGCP proxy socket if MGW listens on an IPv6 address ...................................................................... Patch Set 2: Code-Review+1 not really a scenario we're interested in supporting, but well -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide88c7358a38702ef11c84145518794e75870ef8 Gerrit-Change-Number: 19921 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:24:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:24:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:24:29 +0000 Subject: Change in osmo-bsc[master]: Fail on invalid IP addresses passed to IPACC MDCX In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19936 ) Change subject: Fail on invalid IP addresses passed to IPACC MDCX ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 Gerrit-Change-Number: 19936 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:24:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:25:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:25:11 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local a... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19933 ) Change subject: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local address ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic2b608a055635f94d74cc24c3a934d6458934e82 Gerrit-Change-Number: 19933 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 10:25:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:25:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:25:15 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local a... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19933 ) Change subject: ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local address ...................................................................... ttcn3-bsc-sccplite: Bind osmo-bsc SS7 instance to container's local address Change-Id: Ic2b608a055635f94d74cc24c3a934d6458934e82 --- M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 2e349a4..4d73311 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -55,6 +55,7 @@ cs7 instance 0 point-code 0.23.3 asp asp-clnt-msc-0 5000 0 ipa + local-ip 172.18.12.20 remote-ip 172.18.12.203 as as-clnt-msc-0 ipa asp asp-clnt-msc-0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic2b608a055635f94d74cc24c3a934d6458934e82 Gerrit-Change-Number: 19933 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:25:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:25:50 +0000 Subject: Change in osmo-trx[master]: Add support for TRXC MUTE command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19828 ) Change subject: Add support for TRXC MUTE command ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 Gerrit-Change-Number: 19828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 02 Sep 2020 10:25:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:25:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:25:53 +0000 Subject: Change in osmo-trx[master]: Add support for TRXC MUTE command In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19828 ) Change subject: Add support for TRXC MUTE command ...................................................................... Add support for TRXC MUTE command Related: SYS#4920 Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 2 files changed, 16 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 32e0226..76ae3d3 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -62,7 +62,8 @@ } TransceiverState::TransceiverState() - : mFiller(FILLER_ZERO), mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0) + : mFiller(FILLER_ZERO), mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), + mPower(0.0), mMuted(false) { for (int i = 0; i < 8; i++) { chanType[i] = Transceiver::NONE; @@ -440,7 +441,7 @@ state = &mStates[i]; ratectr_changed = false; - zeros[i] = state->chanType[TN] == NONE; + zeros[i] = state->chanType[TN] == NONE || state->mMuted; Mutex *mtx = mTxPriorityQueues[i].getMutex(); mtx->lock(); @@ -678,6 +679,10 @@ return -ENOENT; } + /* If TRX RF is locked/muted by BTS, send idle burst indications */ + if (state->mMuted) + goto ret_idle; + /* Select the diversity channel with highest energy */ for (size_t i = 0; i < radio_burst->chans(); i++) { float pow = energyDetect(*radio_burst->getVector(i), 20 * mSPSRx); @@ -1006,6 +1011,12 @@ mVersionTRXD[chan] = version_recv; sprintf(response, "RSP SETFORMAT %u %u", version_recv, version_recv); } + } else if (match_cmd(command, "RFMUTE", ¶ms)) { + // (Un)mute RF TX and RX + unsigned mute; + sscanf(params, "%u", &mute); + mStates[chan].mMuted = mute ? true : false; + sprintf(response, "RSP RFMUTE 0 %u", mute); } else if (match_cmd(command, "_SETBURSTTODISKMASK", ¶ms)) { // debug command! may change or disappear without notice // set a mask which bursts to dump to disk diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 39298aa..7a05ac5 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -85,6 +85,9 @@ /* Shadowed downlink attenuation */ int mPower; + /* RF emission and reception disabled, as per NM Administrative State Locked */ + bool mMuted; + /* counters */ struct trx_counters ctrs; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I39983d026ad54c479aa224968e9491d01f30dc35 Gerrit-Change-Number: 19828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:26:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:26:23 +0000 Subject: Change in libosmo-netif[master]: stream: add missing Doxygen \return statements to non-void functions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/19937 ) Change subject: stream: add missing Doxygen \return statements to non-void functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/19937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I693939946497ad08f45cab238a56ceee29578056 Gerrit-Change-Number: 19937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:26:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:26:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:26:26 +0000 Subject: Change in libosmo-netif[master]: stream: add missing Doxygen \return statements to non-void functions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/19937 ) Change subject: stream: add missing Doxygen \return statements to non-void functions ...................................................................... stream: add missing Doxygen \return statements to non-void functions Change-Id: I693939946497ad08f45cab238a56ceee29578056 --- M src/stream.c 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 5f171ea..fc51a49 100644 --- a/src/stream.c +++ b/src/stream.c @@ -289,6 +289,7 @@ /*! \brief Check if Osmocom Stream Client is in connected state * \param[in] cli Osmocom Stream Client + * \return true if connected, false otherwise */ bool osmo_stream_cli_is_connected(struct osmo_stream_cli *cli) { @@ -429,7 +430,9 @@ /*! \brief Create an Osmocom stream client * \param[in] ctx talloc context from which to allocate memory * This function allocates a new \ref osmo_stream_cli and initializes - * it with default values (5s reconnect timer, TCP protocol) */ + * it with default values (5s reconnect timer, TCP protocol) + * \return allocated stream client, or NULL in case of error + */ struct osmo_stream_cli *osmo_stream_cli_create(void *ctx) { struct osmo_stream_cli *cli; @@ -644,6 +647,7 @@ * Open connection of an Osmocom stream client * \param[in] cli Stream Client to connect * \param[in] reconect 1 if we should not automatically reconnect + * \return negative on error, 0 on success */ int osmo_stream_cli_open2(struct osmo_stream_cli *cli, int reconnect) { @@ -716,7 +720,8 @@ /*! \brief Open connection of an Osmocom stream client * By default the client will automatically reconnect after default timeout. * To disable this, use osmo_stream_cli_set_reconnect_timeout() before calling this function. - * \param[in] cli Stream Client to connect */ + * \param[in] cli Stream Client to connect + * \return negative on error, 0 on success */ int osmo_stream_cli_open(struct osmo_stream_cli *cli) { int ret; @@ -1044,7 +1049,8 @@ /*! \brief Open the stream server link. This actually initializes the * underlying socket and binds it to the configured ip/port - * \param[in] link Stream Server Link to open */ + * \param[in] link Stream Server Link to open + * \return negative on error, 0 on success */ int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { int ret; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/19937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I693939946497ad08f45cab238a56ceee29578056 Gerrit-Change-Number: 19937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:27:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:27:20 +0000 Subject: Change in libosmo-sccp[master]: Fix default ASP local addr if remote addr contains only IPv4 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 ) Change subject: Fix default ASP local addr if remote addr contains only IPv4 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 Gerrit-Change-Number: 19932 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 10:27:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:27:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:27:49 +0000 Subject: Change in libosmo-sccp[master]: Fix (2) change in ss7 server default listen addr, keeps backward-comp... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 ) Change subject: Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifbc8df854d1f1e9b07b11911ad5da8cdf9f2080a Gerrit-Change-Number: 19931 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:27:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:27:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:27:52 +0000 Subject: Change in libosmo-sccp[master]: Fix (2) change in ss7 server default listen addr, keeps backward-comp... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 ) Change subject: Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior ...................................................................... Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior This patch is a fixup or extension of commit 96d348efbf29888f5ef923251c7d51d45a897c0b, which only fixed the default values for "asp" VTY node, but not for the xua server's "listen" node. As a result, without this patch, by default the SCTP server socket will only listen on IPv4's "0.0.0.0", since NULL is resolved by getaddrinfo to it instead of "::" as first candidate. Fixes: 96d348efbf29888f5ef923251c7d51d45a897c0b Change-Id: Ifbc8df854d1f1e9b07b11911ad5da8cdf9f2080a --- M src/osmo_ss7_vty.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified keith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 3035844..109b94a 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1871,8 +1871,13 @@ case L_CS7_XUA_NODE: oxs = vty->index; /* If no local addr was set, or erased after _create(): */ - if (!oxs->cfg.local.host_cnt) - osmo_ss7_xua_server_set_local_host(oxs, NULL); + if (!oxs->cfg.local.host_cnt) { + /* "::" Covers both IPv4 and IPv6 */ + if (ipv6_sctp_supported("::", true)) + osmo_ss7_xua_server_set_local_host(oxs, "::"); + else + osmo_ss7_xua_server_set_local_host(oxs, "0.0.0.0"); + } if (osmo_ss7_xua_server_bind(oxs) < 0) vty_out(vty, "%% Unable to bind xUA server to IP(s)%s", VTY_NEWLINE); vty->node = L_CS7_NODE; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifbc8df854d1f1e9b07b11911ad5da8cdf9f2080a Gerrit-Change-Number: 19931 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:28:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:28:46 +0000 Subject: Change in osmo-gsm-manuals[master]: trx_if.adoc: Document RFMUTE TRXC command In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19829 ) Change subject: trx_if.adoc: Document RFMUTE TRXC command ...................................................................... trx_if.adoc: Document RFMUTE TRXC command Change-Id: Id7031b52639f55d36d1589a786e0d29ebb5def53 --- M common/chapters/trx_if.adoc 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 95c00c7..f15ed7b 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -98,6 +98,15 @@ RSP ADJPOWER ---- +`RFMUTE` locks the RF transceiver, hence disabling emission and reception of +information on Air interface of the channel associated to the TRXC connection +the command is sent on. Parameter with value of `1` is used to mute, and value +of `0` is used to unmute. +---- +CMD RFMUTE <1|0> +RSP RFMUTE <1|0> +---- + ==== Tuning Control `RXTUNE` tunes the receiver to a given frequency in kHz. This command fails if the -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Id7031b52639f55d36d1589a786e0d29ebb5def53 Gerrit-Change-Number: 19829 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:30:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:30:14 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19827 ) Change subject: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19827/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/19827/2//COMMIT_MSG at 25 PS2, Line 25: For TRX implementations not : supporting the newly added RFMUTE command, ramping down to -10dBm still : provides for a way to emulate RF locking. how is this triggered? I cannot see any code that would detect if the TRX supoprts RFMUTE or not. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1423ddb390ef327ec7d4a27de2ac5dca663773a5 Gerrit-Change-Number: 19827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Hoernchen Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:30:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:32:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:32:21 +0000 Subject: Change in osmo-bts[master]: bts-trx: Ensure RFMUTE state is set properly at startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19830 ) Change subject: bts-trx: Ensure RFMUTE state is set properly at startup ...................................................................... Patch Set 1: > Patch Set 1: > > I did test that osmo-bts-trx continues working fine if the command is rejected, as expected (since in that case anyway we drop the tx power to -10dBm as a poor man solution to mute). > > I would expect TRX implementations to keep working if a command is not found, but that's really up to the owner of the implementation. If needed we can always add a VTY command to disable it, but given that implementing a fake handler for it (ack it but do nothing) is 5 minutes work, I think we can go forward and add the VTY command later if needed. I thought the "versioned" TRXC protocol provided for a way to determine if a given TRX supported a given feature or not? Maybe I'm mistaken. In the ideal world we would have something like an SMTP EHLO message from the TRX to the BTS, indicating all the (later, optional) features it supports. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25 Gerrit-Change-Number: 19830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 10:32:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:32:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:32:34 +0000 Subject: Change in osmo-bts[master]: bts-trx: Ensure RFMUTE state is set properly at startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19830 ) Change subject: bts-trx: Ensure RFMUTE state is set properly at startup ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25 Gerrit-Change-Number: 19830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 10:32:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:41:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 10:41:18 +0000 Subject: Change in osmo-bsc[master]: Fail on invalid IP addresses passed to IPACC MDCX In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19936 ) Change subject: Fail on invalid IP addresses passed to IPACC MDCX ...................................................................... Fail on invalid IP addresses passed to IPACC MDCX IPACC protocol supports only IPv4 addresses, so make sure if an IPv6 address (or whatever malformed address) is caught is not sent without noticing. Prior to this patch, faulty addresses would be sent over the wire as 255.255.255.255 (-1 returned from inet_addr()). Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 1fe5452..1dd31b1 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -330,6 +330,7 @@ int rc; struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); const struct mgcp_conn_peer *mgw_rtp; + struct in_addr sin; if (lchan->release.requested) { lchan_rtp_fail("Release requested while activating"); @@ -344,8 +345,13 @@ return; } - /* Other RTP settings were already setup in lchan_rtp_fsm_wait_ipacc_crcx_ack_onenter() */ - lchan->abis_ip.connect_ip = ntohl(inet_addr(mgw_rtp->addr)); + /* Other RTP settings were already set up in lchan_rtp_fsm_wait_ipacc_crcx_ack_onenter() */ + if (inet_pton(AF_INET, mgw_rtp->addr, &sin) != 1) { + /* Only IPv4 addresses are supported in IPACC */ + lchan_rtp_fail("Invalid remote IPv4 address %s", mgw_rtp->addr); + return; + } + lchan->abis_ip.connect_ip = ntohl(sin.s_addr); lchan->abis_ip.connect_port = mgw_rtp->port; /* send-recv */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee84e8b40cdede1cacd8e8a9e26dda0d85383ec8 Gerrit-Change-Number: 19936 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 10:43:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 10:43:57 +0000 Subject: Change in osmo-bts[master]: bts-trx: Ensure RFMUTE state is set properly at startup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19830 ) Change subject: bts-trx: Ensure RFMUTE state is set properly at startup ...................................................................... Patch Set 1: > I thought the "versioned" TRXC protocol provided for a way to determine if a given TRX supported a given feature or not? Maybe I'm mistaken. We have introduced the version negotiation for TRXD only, and I would prefer to keep its meaning as TRXD version. > In the ideal world we would have something like an SMTP EHLO message from the TRX to the BTS, indicating all the (later, optional) features it supports. In https://osmocom.org/issues/4006, we discussed a possibility to re-use the CLCK connection for that. Unfortunately, I haven't found enough time to work on this since then :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25 Gerrit-Change-Number: 19830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 10:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 11:12:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 11:12:31 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19887 ) Change subject: mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format ...................................................................... mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format Warning: This breaks libosmo-mgcp-cli ABI! Related: SYS#4915 Change-Id: Ib778e9a72764103b52a462ea3c7fb56b23c1bcd6 --- M TODO-RELEASE M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c 4 files changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index e44305b..8c7cd96 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -25,3 +25,4 @@ # #library what description / commit summary line osmo-mgw update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include +libosmo-mgcp-client mgcp_response, mgcp_conn_peer struct size change, breaks ABI diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index d4dd2d9..8914cc2 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -75,7 +75,7 @@ char *body; struct mgcp_response_head head; uint16_t audio_port; - char audio_ip[INET_ADDRSTRLEN]; + char audio_ip[INET6_ADDRSTRLEN]; unsigned int ptime; enum mgcp_codecs codecs[MGCP_MAX_CODECS]; unsigned int codecs_len; diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index a1ebbb6..e315753 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -15,7 +15,7 @@ * sure it is correct. */ struct mgcp_conn_peer { /*! RTP connection IP-Address (optional, string e.g. "127.0.0.1") */ - char addr[INET_ADDRSTRLEN]; + char addr[INET6_ADDRSTRLEN]; /*! RTP connection IP-Port (optional) */ uint16_t port; diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index b1909f0..146a59d 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1121,7 +1121,7 @@ { unsigned int i; int rc = 0; - char local_ip[INET_ADDRSTRLEN]; + char local_ip[INET6_ADDRSTRLEN]; const char *codec; unsigned int pt; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib778e9a72764103b52a462ea3c7fb56b23c1bcd6 Gerrit-Change-Number: 19887 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 11:14:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 11:14:31 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19827 ) Change subject: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19827/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/19827/2//COMMIT_MSG at 25 PS2, Line 25: For TRX implementations not : supporting the newly added RFMUTE command, ramping down to -10dBm still : provides for a way to emulate RF locking. > how is this triggered? I cannot see any code that would detect if the TRX supoprts RFMUTE or not. Well, RFMUTE is triggered at the end of the ramping down, so RFMUTE is only sent basically when tx pwoer has already been set to -10dBm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1423ddb390ef327ec7d4a27de2ac5dca663773a5 Gerrit-Change-Number: 19827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Hoernchen Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 11:14:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 12:03:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 12:03:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add minimalistic HandoverCommand References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19939 ) Change subject: library/GSM_RR_Types: add minimalistic HandoverCommand ...................................................................... library/GSM_RR_Types: add minimalistic HandoverCommand Similar to [1], the existing implementation [2] is unfriendly to use, so let's work this around by defining a minimalistic implementation of (RR) Handover Command. [1] If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 [2] titan.ProtocolModules.MobileL3_v13.4.0 MobileL3_RRM_Types.PDU_RRM_HandoverCommand_NW_MS Change-Id: I08e6d33a725f99e2c92f93153b2369c4c764c012 Related: SYS#4868, OS#4545 --- M library/GSM_RR_Types.ttcn 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/19939/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index c2c9d1b..2cb50bc 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -694,6 +694,36 @@ )" }; + /* 3GPP TS 44.018, section 9.1.15 (minimalistic implementation) */ + type record HandoverCommand { + CellDescriptionV cell_desc, + ChannelDescription chan_desc, + OCT1 ho_ref, + PowerCommandAndAccesstype_V power_cmd_acc_type, + FrequencyList_TLV freq_list_at optional, + CellChannelDescription_TV cell_chan_desc optional, + ChannelMode_TV chan1_mode optional, + ChannelMode_TV chan2_mode optional, + /* TODO: Mode of Channel Set 3..8 IE */ + MobileAllocationTLV mobile_allocation optional + /* TODO: more optional IEs... */ + } with { + variant "TAG( + freq_list_at, elementIdentifier = '05'O; + cell_chan_desc, elementIdentifier = '62'O; + chan1_mode, elementIdentifier = '63'O; + chan2_mode, elementIdentifier = '11'O; + mobile_allocation, iei = '72'O; + )" + }; + + /* 10.5.2.2 Cell Description IE */ + type record CellDescriptionV { + uint3_t bcc, /* PLMN colour code */ + uint3_t ncc, /* BS colour code */ + uint10_t bcch_arfcn + } with { variant "FIELDORDER(lsb)" }; + /* 9.1.18 */ type record ImmediateAssignment { @@ -853,6 +883,7 @@ PagingResponse paging_response, MeasurementReport meas_rep, AssignmentCommand ass_cmd, + HandoverCommand ho_cmd, octetstring other }; @@ -863,6 +894,7 @@ paging_response, header.message_type = PAGING_RESPONSE; meas_rep, header.message_type = MEASUREMENT_REPORT; ass_cmd, header.message_type = ASSIGNMENT_COMMAND; + ho_cmd, header.message_type = HANDOVER_COMMAND; other, OTHERWISE; )" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I08e6d33a725f99e2c92f93153b2369c4c764c012 Gerrit-Change-Number: 19939 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 12:03:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 12:03:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19940 ) Change subject: BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd ...................................................................... BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd Change-Id: I6ccee0296e3f5ae13086b8e68c1709e386f59e97 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/19940/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0099d5a..87e0d08 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7124,7 +7124,7 @@ /* Make sure that Cell Channel Description IE is present if FH is enabled */ if (chan_desc.h and not ispresent(l3_msg.payload.ass_cmd.cell_chan_desc)) { - setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); + setverdict(fail, "FH enabled, but Cell Channel Description IE is absent"); continue; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6ccee0296e3f5ae13086b8e68c1709e386f59e97 Gerrit-Change-Number: 19940 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 12:03:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 12:03:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19941 ) Change subject: BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() ...................................................................... BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() Change-Id: Id8b1e9fb62f9deaa5517d7366271437af0fc6eef Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/19941/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 87e0d08..1b37f78 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6918,7 +6918,7 @@ } /* Ensure that ma_mask is octet-aligned */ - ma_mask := substr(ma_mask, 0, ma_mask_len + 1); + ma_mask := substr(ma_mask, 0, ma_mask_len); ma_mask_len := (ma_mask_len + 8 - 1) / 8; ma_mask := f_pad_bit(ma_mask, ma_mask_len * 8, '0'B); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id8b1e9fb62f9deaa5517d7366271437af0fc6eef Gerrit-Change-Number: 19941 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 12:03:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 12:03:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: make f_vty_{handover, ss_action}() more flexible References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19942 ) Change subject: BSC_Tests/hopping: make f_vty_{handover,ss_action}() more flexible ...................................................................... BSC_Tests/hopping: make f_vty_{handover,ss_action}() more flexible Make it possible to call them from a testcase / function running on any kind of component, not only on MSC_ConnHdlr. Change-Id: Ifbcc24c5a0299ba43a998ccbdd0f77bc109c6935 --- M bsc/BSC_Tests.ttcn 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/19942/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 1b37f78..fb9fa68 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -4156,8 +4156,10 @@ } /* execute a "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7>" command on given Dchan */ -private function f_vty_ss_action(charstring suffix, integer bts_nr, integer trx_nr, RslChannelNr chan_nr) -runs on MSC_ConnHdlr { +private function f_vty_ss_action(TELNETasp_PT pt, charstring suffix, + uint8_t bts_nr, uint8_t trx_nr, + in RslChannelNr chan_nr) +{ /* FIXME: resolve those from component-global state */ var integer ts_nr := chan_nr.tn; var integer ss_nr; @@ -4176,7 +4178,7 @@ var charstring cmd := "bts "&int2str(bts_nr)&" trx "&int2str(trx_nr)& " timeslot "&int2str(ts_nr)&" sub-slot "&int2str(ss_nr)&" "; - f_vty_transceive(BSCVTY, cmd & suffix); + f_vty_transceive(pt, cmd & suffix); } /* Even though the VTY command to trigger handover takes a new BTS number as argument, behind the scenes osmo-bsc always @@ -4184,10 +4186,10 @@ * ident key (ARFCN + BSIC) in the struct passed on to handover_request(). handover_start() then resolves that to a * viable actual neighbor cell. So from the internal osmo-bsc perspective, we always request handover to an ARFCN + BSIC * pair, not really to a specific BTS number. */ -private function f_vty_handover(integer bts_nr, integer trx_nr, RslChannelNr chan_nr, - integer new_bts_nr) -runs on MSC_ConnHdlr { - f_vty_ss_action("handover " & int2str(new_bts_nr), bts_nr, trx_nr, chan_nr); +private function f_vty_handover(TELNETasp_PT pt, uint8_t bts_nr, uint8_t trx_nr, + in RslChannelNr chan_nr, uint8_t new_bts_nr) +{ + f_vty_ss_action(pt, "handover " & int2str(new_bts_nr), bts_nr, trx_nr, chan_nr); } /* intra-BSC hand-over between BTS0 and BTS1 */ @@ -4209,7 +4211,7 @@ old_chan_nr := - }; /* issue hand-over command on VTY */ - f_vty_handover(0, 0, g_chan_nr, 1); + f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); /* temporarily suspend DChan processing on BTS1 to avoid race with RSLEM_register */ f_rslem_suspend(RSL1_PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifbcc24c5a0299ba43a998ccbdd0f77bc109c6935 Gerrit-Change-Number: 19942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 12:03:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 12:03:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_handover_cmd References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 ) Change subject: BSC_Tests/hopping: add TC_fh_params_handover_cmd ...................................................................... BSC_Tests/hopping: add TC_fh_params_handover_cmd Similar to TC_fh_params_assignment_cmd, this test case verifies presence and correctness of the hopping parameters in the following messages and their IEs: 1. (RR) Handover Command 1.1. Description of the First Channel, after time IE 1.2. Cell Channel Description IE (presence) 1.3. Mobile Allocation, after time IE The hopping parameters are randomly generated and configured via the VTY interface in the beginning, and unset in the end. Since the C0/TS0 (BCCH+SDCCH4+CBCH) shall not be hopping, let's temporarily re-configure TS0 as BCCH, and TS1 as SDCCH8 on TRX0 of BTS1 (handover tagret). Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 101 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/19943/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fb9fa68..04049e8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7153,6 +7153,106 @@ setverdict(pass); } +/* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Handover Command */ +private function f_TC_fh_params_handover_cmd(in FHParamsTrx fhp) +runs on test_CT { + var RSL_Message rsl_msg; + var RSL_IE_Body ie; + var DchanTuple dt; + + /* Establish a dedicated channel, so we can trigger handover */ + dt := f_est_dchan(f_rnd_ra_cs(), 23, f_rnd_octstring(16)); + + /* Trigger handover from BTS#0 to BTS#1 */ + f_bts_0_cfg(BSCVTY, { "neighbor bts 1" }); + f_vty_handover(BSCVTY, 0, 0, dt.rsl_chan_nr, 1); + + /* Expect RSL CHANnel ACTIVation on BTS#1/TRX#0/TS#1 */ + rsl_msg := f_exp_ipa_rx(1, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); + + /* ACKnowledge channel activation and expect (RR) Handover Command */ + f_ipa_tx(1, ts_RSL_CHAN_ACT_ACK(rsl_msg.ies[0].body.chan_nr, 33)); + rsl_msg := f_exp_ipa_rx(0, tr_RSL_MsgTypeR(RSL_MT_DATA_REQ)); + + /* Make sure that L3 Information IE is present */ + if (not f_rsl_find_ie(rsl_msg, RSL_IE_L3_INFO, ie)) { + setverdict(fail, "RSL L3 Information IE is absent"); + return; + } + + /* Decode the L3 message and make sure it is (RR) Handover Command */ + var GsmRrL3Message l3_msg := dec_GsmRrL3Message(ie.l3_info.payload); + if (not match(l3_msg.header, t_RrL3Header(HANDOVER_COMMAND))) { + setverdict(fail, "Failed to match Handover Command: ", l3_msg); + return; + } + + /* Make sure that we've got SDCCH/8 on TS1 (expected to be hopping) */ + var ChannelDescription chan_desc := l3_msg.payload.ho_cmd.chan_desc; + if (not match(chan_desc.chan_nr, t_RslChanNr_SDCCH8(1, ?))) { + setverdict(fail, "Unexpected channel number: ", chan_desc.chan_nr); + return; + } + + /* Make sure that hopping parameters (HSN/MAIO) match */ + f_TC_fh_params_match_chan_desc(fhp, chan_desc); + + /* Make sure that Cell Channel Description IE is present */ + if (not ispresent(l3_msg.payload.ho_cmd.cell_chan_desc)) { + setverdict(fail, "FH enabled, but Cell Channel Description IE is absent"); + return; + } + + /* Make sure that the Mobile Allocation (after time) IE is present and matches */ + var boolean ma_present := ispresent(l3_msg.payload.ho_cmd.mobile_allocation); + if (ma_present) { + f_TC_fh_params_match_ma(fhp, chan_desc.chan_nr.tn, + l3_msg.payload.ho_cmd.mobile_allocation.v); + } else { + setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); + return; + } +} +testcase TC_fh_params_handover_cmd() runs on test_CT { + var FHParamsTrx fhp := f_TC_fh_params_gen(tr_tn := 1); + + f_init_vty(); + + /* (Re)configure TS0 as BCCH and TS1 as SDCCH8 on BTS#1/TRX#0 */ + f_vty_enter_cfg_trx(BSCVTY, bts := 1, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config sdcch8"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + f_TC_fh_params_set(fhp, 1); /* Enable frequency hopping on BTS#1 */ + f_vty_transceive(BSCVTY, "drop bts connection 1 oml"); + + f_init(2); + + f_TC_fh_params_handover_cmd(fhp); + + /* Disable frequency hopping on BTS#1 */ + f_TC_fh_params_unset(fhp, 1); + + /* (Re)configure TS0 as CCCH+SDCCH4 and TS1 as TCH/F */ + f_vty_enter_cfg_trx(BSCVTY, bts := 1, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config tch/f"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + setverdict(pass); +} + /* Verify the hopping parameters in System Information Type 4 */ testcase TC_fh_params_si4_cbch() runs on test_CT { var FHParamsTrx fhp := f_TC_fh_params_gen(tr_tn := 1); @@ -7464,6 +7564,7 @@ execute( TC_fh_params_chan_activ() ); execute( TC_fh_params_imm_ass() ); execute( TC_fh_params_assignment_cmd() ); + execute( TC_fh_params_handover_cmd() ); execute( TC_fh_params_si4_cbch() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Gerrit-Change-Number: 19943 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 12:04:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 12:04:00 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19944 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... gsm_04_08_rr: fix hopping parameters in RR Assignment Command A similar problem has already been fixed in [1]: - include GSM48_IE_MA_AFTER instead of GSM48_IE_MA_BEFORE, - fix position of the Mobile Allocation (after time) IE. This problem was uncovered by (not yet merged) TTCN-3 test case verifying handling of the hopping parameters [2]. This change makes it pass. [1] I43ef66c109b107ebcaa1cb6197637701b13b3787 [2] BSC_Tests.TC_fh_params_handover_cmd Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/19944/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 69ec4d3..be114f0 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -523,23 +523,24 @@ if (new_lchan->ts->hopping.enabled) { struct gsm_bts *bts = new_lchan->ts->trx->bts; struct gsm48_system_information_type_1 *si1; - uint8_t *cur; si1 = GSM_BTS_SI(bts, SYSINFO_TYPE_1); /* Copy the Cell Chan Desc (ARFCNS in this cell) */ - msgb_put_u8(msg, GSM48_IE_CELL_CH_DESC); - cur = msgb_put(msg, GSM48_HOCMD_CCHDESC_LEN); - memcpy(cur, si1->cell_channel_description, - GSM48_HOCMD_CCHDESC_LEN); - /* Copy the Mobile Allocation */ - msgb_tlv_put(msg, GSM48_IE_MA_BEFORE, - new_lchan->ts->hopping.ma_len, - new_lchan->ts->hopping.ma_data); + msgb_tv_fixed_put(msg, GSM48_IE_CELL_CH_DESC, + GSM48_HOCMD_CCHDESC_LEN, + si1->cell_channel_description); } /* FIXME: optional bits for type of synchronization? */ msgb_tv_put(msg, GSM48_IE_CHANMODE_1, new_lchan->tch_mode); + /* Mobile Allocation (after time), TLV (see 3GPP TS 44.018, 10.5.2.21) */ + if (new_lchan->ts->hopping.enabled) { + msgb_tlv_put(msg, GSM48_IE_MA_AFTER, + new_lchan->ts->hopping.ma_len, + new_lchan->ts->hopping.ma_data); + } + /* in case of multi rate we need to attach a config */ if (new_lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) msgb_tlv_put(msg, GSM48_IE_MUL_RATE_CFG, new_lchan->mr_ms_lv[0], -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Gerrit-Change-Number: 19944 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 14:42:38 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 2 Sep 2020 14:42:38 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... Patch Set 2: Code-Review-1 (3 comments) Thanks! Here is a diff that you can join into this patch if you agree. It contains: - in lchan_fsm.dot, a transition is missing; - add lchan.msc changes - add assignment.msc changes http://git.osmocom.org/osmo-bsc/commit/?h=neels/mode_modif&id=04aeff09ecad83bbaeaf8def353eb21d375876f4 voting -1 because of the missing 'return', see below https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19792/1/src/osmo-bsc/lchan_fsm.c at 923 PS1, Line 923: lchan_rtp_fsm_start(lchan); > I would suppose there are such situations, let's say you start a USSD command just after ending a ca [?] I assume it is also possible that the MSC requests a re-assignment to a different voice codec. At least that could be useful in osmo-msc when we want to avoid transcoding, e.g. after the other call leg handovered to a different codec. Or actually also when establishing a call, in osmo-msc MO currently determines a voice codec and does Assignment, and only later does the MT side communicate its codec capabilities. We may want to modify the codec again before bridging the call legs. https://gerrit.osmocom.org/c/osmo-bsc/+/19792/2/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19792/2/src/osmo-bsc/lchan_fsm.c at 803 PS2, Line 803: else { ( else if (...) ) https://gerrit.osmocom.org/c/osmo-bsc/+/19792/2/src/osmo-bsc/lchan_fsm.c at 1011 PS2, Line 1011: lchan_fail("MODE MODIFY not implemented when RTP voice stream is already active (VOICE => SIGNALLING?)\n"); missing 'return;' ! it could be voice => voice too, to change the codec -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 02 Sep 2020 14:42:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: dexter Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:22:57 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 15:22:57 +0000 Subject: Change in libosmocore[master]: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19142 ) Change subject: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port ...................................................................... sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port In case the port isn't known at the time osmo_sockaddr_str_from_str2() parse only the ip and don't touch the port. This is the case when a user has different vty commands for ip and port. Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 --- M include/osmocom/core/sockaddr_str.h M src/sockaddr_str.c 2 files changed, 34 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index e42216a..d96b743 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -74,6 +74,7 @@ int osmo_sockaddr_str_cmp(const struct osmo_sockaddr_str *a, const struct osmo_sockaddr_str *b); int osmo_sockaddr_str_from_str(struct osmo_sockaddr_str *sockaddr_str, const char *ip, uint16_t port); +int osmo_sockaddr_str_from_str2(struct osmo_sockaddr_str *sockaddr_str, const char *ip); int osmo_sockaddr_str_from_in_addr(struct osmo_sockaddr_str *sockaddr_str, const struct in_addr *addr, uint16_t port); int osmo_sockaddr_str_from_in6_addr(struct osmo_sockaddr_str *sockaddr_str, const struct in6_addr *addr, uint16_t port); diff --git a/src/sockaddr_str.c b/src/sockaddr_str.c index c38a05c..f5508a0 100644 --- a/src/sockaddr_str.c +++ b/src/sockaddr_str.c @@ -188,6 +188,34 @@ return AF_UNSPEC; } +/*! Safely copy the given ip string to sockaddr_str, classify to AF_INET or AF_INET6. + * Data will be written to sockaddr_str even if an error is returned. + * \param[out] sockaddr_str The instance to copy to. + * \param[in] ip Valid IP address string. + * \return 0 on success, negative if copying the address string failed (e.g. too long), if the address family could + * not be detected (i.e. if osmo_ip_str_type() returned AF_UNSPEC), or if sockaddr_str is NULL. + */ +int osmo_sockaddr_str_from_str2(struct osmo_sockaddr_str *sockaddr_str, const char *ip) +{ + int rc; + if (!sockaddr_str) + return -ENOSPC; + if (!ip) + ip = ""; + sockaddr_str->af = osmo_ip_str_type(ip); + /* to be compatible with previous behaviour, zero the full IP field. + * Allow the usage of memcmp(&sockaddr_str, ...) */ + memset(sockaddr_str->ip, 0x0, sizeof(sockaddr_str->ip)); + rc = osmo_strlcpy(sockaddr_str->ip, ip, sizeof(sockaddr_str->ip)); + if (rc <= 0) + return -EIO; + if (rc >= sizeof(sockaddr_str->ip)) + return -ENOSPC; + if (sockaddr_str->af == AF_UNSPEC) + return -EINVAL; + return 0; +} + /*! Safely copy the given ip string to sockaddr_str, classify to AF_INET or AF_INET6, and set the port. * Data will be written to sockaddr_str even if an error is returned. * \param[out] sockaddr_str The instance to copy to. @@ -201,20 +229,11 @@ int rc; if (!sockaddr_str) return -ENOSPC; - if (!ip) - ip = ""; - *sockaddr_str = (struct osmo_sockaddr_str){ - .af = osmo_ip_str_type(ip), - .port = port, - }; - rc = osmo_strlcpy(sockaddr_str->ip, ip, sizeof(sockaddr_str->ip)); - if (rc <= 0) - return -EIO; - if (rc >= sizeof(sockaddr_str->ip)) - return -ENOSPC; - if (sockaddr_str->af == AF_UNSPEC) - return -EINVAL; - return 0; + + rc = osmo_sockaddr_str_from_str2(sockaddr_str, ip); + sockaddr_str->port = port; + + return rc; } /*! Convert IPv4 address to osmo_sockaddr_str, and set port. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 Gerrit-Change-Number: 19142 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:24:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 15:24:05 +0000 Subject: Change in libosmocore[master]: tests/socket: add testcase test_get_ip_and_port In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19147 to look at the new patch set (#13). Change subject: tests/socket: add testcase test_get_ip_and_port ...................................................................... tests/socket: add testcase test_get_ip_and_port Check if osmo_sock_get_ip_and_port() works correct. Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 --- M tests/socket/socket_test.c M tests/socket/socket_test.ok 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/19147/13 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:24:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 15:24:05 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#15). Change subject: socket: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... socket: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 309 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/15 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 15 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:24:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 15:24:05 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#15). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,074 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/15 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 15 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:25:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 15:25:17 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19945 ) Change subject: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands ...................................................................... mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/45/19945/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index e38a4ba..2505ff2 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -25,6 +25,7 @@ #include #include #include +#include /* Context information, this is attached to the priv pointer of the FSM and * is also handed back when dispatcheing events to the parent FSM. This is @@ -607,14 +608,16 @@ { struct mgcp_ctx *mgcp_ctx; struct osmo_fsm_inst *fi; - struct in_addr ip_test; + struct in6_addr ip_test; + OSMO_ASSERT(parent_fi); OSMO_ASSERT(mgcp); OSMO_ASSERT(conn_peer); /* Check if IP/Port information in conn info makes sense */ - if (conn_peer->port && inet_aton(conn_peer->addr, &ip_test) == 0) + if (conn_peer->port && inet_pton(osmo_ip_str_type(conn_peer->addr), + conn_peer->addr, &ip_test) != 1) return NULL; /* Allocate and configure a new fsm instance */ @@ -644,7 +647,7 @@ { OSMO_ASSERT(fi); struct mgcp_ctx *mgcp_ctx = fi->priv; - struct in_addr ip_test; + struct in6_addr ip_test; OSMO_ASSERT(mgcp_ctx); OSMO_ASSERT(conn_peer); @@ -668,8 +671,8 @@ LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, port == 0\n"); return -EINVAL; } - if (inet_aton(conn_peer->addr, &ip_test) == 0) { - LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, IP address == 0.0.0.0\n"); + if (inet_pton(osmo_ip_str_type(conn_peer->addr), conn_peer->addr, &ip_test) != 1) { + LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, IP address %s\n", conn_peer->addr); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732 Gerrit-Change-Number: 19945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:25:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 15:25:18 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Deprecate unused IPv4-only API References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19946 ) Change subject: mgcp_client: Deprecate unused IPv4-only API ...................................................................... mgcp_client: Deprecate unused IPv4-only API The API and related implementation fields are not used internally nor externally, and only support IPv4. Let's simply deprecate the API and drop all the uneeded implementation. Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc --- M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_internal.h M src/libosmo-mgcp-client/mgcp_client.c 3 files changed, 4 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/46/19946/1 diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index b5a3529..02996a7 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -133,7 +133,7 @@ const char *mgcp_client_remote_addr_str(struct mgcp_client *mgcp); uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp); -uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp); +uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp) OSMO_DEPRECATED("deprecated, returns 0"); const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp); const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp); diff --git a/include/osmocom/mgcp_client/mgcp_client_internal.h b/include/osmocom/mgcp_client/mgcp_client_internal.h index 690a4af..b4b3b02 100644 --- a/include/osmocom/mgcp_client/mgcp_client_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_internal.h @@ -6,7 +6,6 @@ struct mgcp_client { struct mgcp_client_conf actual; - uint32_t remote_addr; struct osmo_wqueue wq; mgcp_trans_id_t next_trans_id; struct llist_head responses_pending; diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 72068b4..5972803 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -823,7 +823,6 @@ * \returns 0 on success, -EINVAL on error. */ int mgcp_client_connect(struct mgcp_client *mgcp) { - struct sockaddr_in addr; struct osmo_wqueue *wq; int rc; @@ -843,9 +842,6 @@ goto error_close_fd; } - inet_aton(mgcp->actual.remote_addr, &addr.sin_addr); - mgcp->remote_addr = htonl(addr.sin_addr.s_addr); - osmo_wqueue_init(wq, 1024); wq->bfd.when = OSMO_FD_READ; wq->bfd.data = mgcp; @@ -877,12 +873,13 @@ return mgcp->actual.remote_port; } -/*! Get the IP-Aaddress of the associated MGW as its numeric representation. +/*! Get the IP-Address of the associated MGW as its numeric representation. + * DEPRECATED, DON'T USE. * \param[in] mgcp MGCP client descriptor. * \returns IP-Address as 32 bit integer (network byte order) */ uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp) { - return mgcp->remote_addr; + return 0; } /* To compose endpoint names, usually for CRCX, use this as domain name. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc Gerrit-Change-Number: 19946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:38:43 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 15:38:43 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#16). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,077 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/16 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:45:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 15:45:51 +0000 Subject: Change in libosmocore[master]: tests/socket: add testcase test_get_ip_and_port In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: tests/socket: add testcase test_get_ip_and_port ...................................................................... Patch Set 13: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 15:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:47:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 15:47:01 +0000 Subject: Change in libosmocore[master]: tests/socket: add testcase test_get_ip_and_port In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: tests/socket: add testcase test_get_ip_and_port ...................................................................... Patch Set 13: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19147/13/tests/socket/socket_test.c File tests/socket/socket_test.c: https://gerrit.osmocom.org/c/libosmocore/+/19147/13/tests/socket/socket_test.c at 164 PS13, Line 164: fd = osmo_sock_init2(AF_INET, SOCK_DGRAM, IPPROTO_UDP, "127.0.0.1", 0, "127.0.0.1", 55, wondering how is this working given that I see no socket listening there... :/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 15:47:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:47:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 15:47:56 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... Patch Set 15: Naming comments not applied (osmo_sock_init_sa) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 15 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 02 Sep 2020 15:47:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 15:57:39 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 2 Sep 2020 15:57:39 +0000 Subject: Change in libosmocore[master]: tests/socket: add testcase test_get_ip_and_port In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: tests/socket: add testcase test_get_ip_and_port ...................................................................... Patch Set 13: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19147/13/tests/socket/socket_test.c File tests/socket/socket_test.c: https://gerrit.osmocom.org/c/libosmocore/+/19147/13/tests/socket/socket_test.c at 164 PS13, Line 164: fd = osmo_sock_init2(AF_INET, SOCK_DGRAM, IPPROTO_UDP, "127.0.0.1", 0, "127.0.0.1", 55, > wondering how is this working given that I see no socket listening there... [?] Connect on UDP is just a local operation that lets you use send() and recv() (instead of using sendto/recvfrom with a remote addr) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 15:57:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:11:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 16:11:24 +0000 Subject: Change in libosmocore[master]: tests/socket: add testcase test_get_ip_and_port In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: tests/socket: add testcase test_get_ip_and_port ...................................................................... Patch Set 13: Ah good point, thanks! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 16:11:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:15:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 16:15:38 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19947 ) Change subject: iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) ...................................................................... iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) If we expect only a single byte in response to the TPDU header, the cuart driver sends us RX_SINGLE events, not RX_COMPLETE events. Change-Id: I3f025bc88b9aacc07ae87307328cec56efbac2ab Closes: OS#4741 --- M ccid_common/iso7816_fsm.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/47/19947/1 diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 307dac3..02e7c0d 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1273,7 +1273,12 @@ } else { card_uart_set_rx_threshold(ip->uart, tpduh->p3); card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, tpduh->p3); - osmo_fsm_inst_state_chg(fi, TPDU_S_RX_REMAINING, 0, 0); + /* if the expected length is only one byte, cuart will issue + * TPDU_S_RX_SINGLE instead of TPDU_S_RX_REMAINING (OS#4741) */ + if (tpduh->p3 == 1) + osmo_fsm_inst_state_chg(fi, TPDU_S_RX_SINGLE, 0, 0); + else + osmo_fsm_inst_state_chg(fi, TPDU_S_RX_REMAINING, 0, 0); } } else if (byte == (tpduh->ins ^ 0xFF)) { /* transmit/recieve single byte then wait for proc */ @@ -1521,7 +1526,8 @@ .name = "RX_SINGLE", .in_event_mask = S(ISO7816_E_RX_SINGLE), .out_state_mask = S(TPDU_S_INIT) | - S(TPDU_S_PROCEDURE), + S(TPDU_S_PROCEDURE) | + S(TPDU_S_SW1), .action = tpdu_s_rx_single_action, }, [TPDU_S_SW1] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3f025bc88b9aacc07ae87307328cec56efbac2ab Gerrit-Change-Number: 19947 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:15:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 16:15:38 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: ignore RX_SINGLE events during transmit References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 ) Change subject: iso7816_fsm: ignore RX_SINGLE events during transmit ...................................................................... iso7816_fsm: ignore RX_SINGLE events during transmit When logging is enabled, we get a lot of LOGL_ERROR events about RX_SINGLE events not being permitted. This is not very useful in debugging, so suppress those error messages. Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 --- M ccid_common/iso7816_fsm.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/48/19948/1 diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 02e7c0d..ffb5b05 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1218,6 +1218,8 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); OSMO_ASSERT(fi->fsm == &tpdu_fsm); switch (event) { + case ISO7816_E_RX_SINGLE: + return; case ISO7816_E_TX_COMPL: card_uart_set_rx_threshold(ip->uart, 1); @@ -1307,6 +1309,8 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); switch (event) { + case ISO7816_E_RX_SINGLE: + return; case ISO7816_E_TX_COMPL: card_uart_set_rx_threshold(ip->uart, 1); card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, 1); @@ -1484,7 +1488,7 @@ }, [TPDU_S_TX_HDR] = { .name = "TX_HDR", - .in_event_mask = S(ISO7816_E_TX_COMPL), + .in_event_mask = S(ISO7816_E_TX_COMPL) | S(ISO7816_E_RX_SINGLE), .out_state_mask = S(TPDU_S_INIT) | S(TPDU_S_PROCEDURE), .action = tpdu_s_tx_hdr_action, @@ -1503,7 +1507,7 @@ }, [TPDU_S_TX_REMAINING] = { .name = "TX_REMAINING", - .in_event_mask = S(ISO7816_E_TX_COMPL), + .in_event_mask = S(ISO7816_E_TX_COMPL) | S(ISO7816_E_RX_SINGLE), .out_state_mask = S(TPDU_S_INIT) | S(TPDU_S_SW1), .action = tpdu_s_tx_remaining_action, -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 Gerrit-Change-Number: 19948 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:21:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:21:33 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init3_osa_ofd In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#16). Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init3_osa_ofd ...................................................................... socket: introduce osmo_sock_init_osa & osmo_sock_init3_osa_ofd osmo_sock_init_osa() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 310 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/16 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:21:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:21:33 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19415 to look at the new patch set (#14). Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... socket: add osmo_sockaddr_cmp() Compare two osmo_sockaddr. Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/19415/14 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 14 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:21:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:21:33 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19416 to look at the new patch set (#14). Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... add osmo_sockaddr_local_ip() to determine the local address for a remote. Similiar to osmo_sock_local_ip but for osmo_sockaddr. Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/19416/14 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 14 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:21:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:21:33 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#17). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,163 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/17 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 17 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:22:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:22:02 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#17). Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd osmo_sock_init_osa() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 310 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/17 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 17 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:22:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:22:02 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19415 to look at the new patch set (#15). Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... socket: add osmo_sockaddr_cmp() Compare two osmo_sockaddr. Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/19415/15 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 15 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:22:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:22:02 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19416 to look at the new patch set (#15). Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... add osmo_sockaddr_local_ip() to determine the local address for a remote. Similiar to osmo_sock_local_ip but for osmo_sockaddr. Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/19416/15 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 15 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:22:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:22:02 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#18). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,163 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/18 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 18 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:26:48 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:26:48 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#18). Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd osmo_sock_init_osa() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 310 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/18 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 18 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:27:45 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:27:45 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... Patch Set 18: (8 comments) https://gerrit.osmocom.org/c/libosmocore/+/19143/13/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/c/libosmocore/+/19143/13/include/osmocom/core/socket.h at 61 PS13, Line 61: int osmo_sock_init3(uint16_t type, uint8_t proto, > I agree on that Done https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c at 454 PS13, Line 454: osmo_strlcpy(dest.ip, "Invalid IP", 11) > I know the macro is used only here in a limited code base, but doing this kind of macro safely would [?] Done https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c at 465 PS13, Line 465: * This function creates a new socket of the designated \a family, \a > No "family" parameter here. Done https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c at 496 PS13, Line 496: if (flags & OSMO_SOCK_F_BIND && !local) { > maybe it's just my own uncertainty about operator precedence, but more braces would be nice Done https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c at 500 PS13, Line 500: > (ws: two blank lines) Done https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c at 502 PS13, Line 502: if (flags & OSMO_SOCK_F_CONNECT && !remote) { > more braces would be nice Done https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c at 508 PS13, Line 508: flags & OSMO_SOCK_F_CONNECT && > more braces would be nice Done https://gerrit.osmocom.org/c/libosmocore/+/19143/13/src/socket.c at 525 PS13, Line 525: if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { > more braces would be nice Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 18 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 02 Sep 2020 16:27:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:31:24 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:31:24 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... Patch Set 16: (9 comments) https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1562 PS11, Line 1562: /*! Compare two osmo_sockaddr. Return 0 if they are same > "the same". End with a ".". Actually the \return is already below. Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1563 PS11, Line 1563: * \brief osmo_sockaddr_cmp > we use AUTO_BRIEF, so drop this \brief line Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1566 PS11, Line 1566: * \return 0 if a and b are equal. > the naming of "cmp" implies being able to use the return code for sorting. [?] Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1570 PS11, Line 1570: if (!a && !b) > this could be just [?] Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1573 PS11, Line 1573: return 1; > -1 Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1577 PS11, Line 1577: return 1; > return OSMO_CMP(a->.., b->.. [?] Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1583 PS11, Line 1583: a->u.sin.sin_port == b->u.sin.sin_port); > cleaner, type wise, would be to return ? 0 : 1 [?] Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1585 PS11, Line 1585: /* AF_INET6 usally not contain any padding */ > "does not" Done https://gerrit.osmocom.org/c/libosmocore/+/19415/11/src/socket.c at 1588 PS11, Line 1588: /* fallback to memcmp for remaing AF */ > "remaining" Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 16:31:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:32:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:32:11 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19415 to look at the new patch set (#17). Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... socket: add osmo_sockaddr_cmp() Compare two osmo_sockaddr. Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/19415/17 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 17 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:32:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:32:11 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19416 to look at the new patch set (#17). Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... add osmo_sockaddr_local_ip() to determine the local address for a remote. Similiar to osmo_sock_local_ip but for osmo_sockaddr. Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/19416/17 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 17 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:34:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:34:09 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#19). Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd osmo_sock_init_osa() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 310 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/19 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:36:44 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 2 Sep 2020 16:36:44 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... Patch Set 18: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 18 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 16:36:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:38:36 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:38:36 +0000 Subject: Change in libosmocore[master]: tests/socket: add testcase test_get_ip_and_port In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: tests/socket: add testcase test_get_ip_and_port ...................................................................... tests/socket: add testcase test_get_ip_and_port Check if osmo_sock_get_ip_and_port() works correct. Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 --- M tests/socket/socket_test.c M tests/socket/socket_test.ok 2 files changed, 35 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index ae77184..64e48bc 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -154,6 +154,38 @@ return 0; } +static int test_get_ip_and_port() +{ + int fd, rc; + char ip[INET6_ADDRSTRLEN] = { }; + char port[6] = { }; + + printf("Checking test_get_ip_and_port() for combined BIND + CONNECT on IPv4\n"); + fd = osmo_sock_init2(AF_INET, SOCK_DGRAM, IPPROTO_UDP, "127.0.0.1", 0, "127.0.0.1", 55, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + + OSMO_ASSERT(fd >= 0); + + /* get the remote */ + rc = osmo_sock_get_ip_and_port(fd, ip, sizeof(ip), port, sizeof(port), false); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(strncmp(ip, "127.0.0.1", INET6_ADDRSTRLEN) == 0); + OSMO_ASSERT(strncmp(port, "55", 6) == 0); + + printf("Checking test_get_ip_and_port() for combined BIND + CONNECT on IPv6\n"); + fd = osmo_sock_init2(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, "::1", 0, "::1", 55, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd >= 0); + + /* get the remote */ + rc = osmo_sock_get_ip_and_port(fd, ip, sizeof(ip), port, sizeof(port), false); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(strncmp(ip, "::1", INET6_ADDRSTRLEN) == 0); + OSMO_ASSERT(strncmp(port, "55", 6) == 0); + + return 0; +} + const struct log_info_cat default_categories[] = { }; @@ -171,6 +203,7 @@ test_sockinit(); test_sockinit2(); + test_get_ip_and_port(); return EXIT_SUCCESS; } diff --git a/tests/socket/socket_test.ok b/tests/socket/socket_test.ok index 696e356..589036f 100644 --- a/tests/socket/socket_test.ok +++ b/tests/socket/socket_test.ok @@ -10,3 +10,5 @@ Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv4 Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv6 Checking osmo_sock_init2(AF_UNSPEC) BIND on IPv4 +Checking test_get_ip_and_port() for combined BIND + CONNECT on IPv4 +Checking test_get_ip_and_port() for combined BIND + CONNECT on IPv6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 16:42:29 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 Sep 2020 16:42:29 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#20). Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd osmo_sock_init_osa() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 310 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/20 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 17:03:19 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 2 Sep 2020 17:03:19 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... Patch Set 19: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 02 Sep 2020 17:03:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 17:18:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 17:18:36 +0000 Subject: Change in osmo-bts[master]: osmo-bts-omldummy: enable BTS_FEAT_{CBCH, HOPPING} support In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19938 ) Change subject: osmo-bts-omldummy: enable BTS_FEAT_{CBCH,HOPPING} support ...................................................................... osmo-bts-omldummy: enable BTS_FEAT_{CBCH,HOPPING} support Otherwise osmo-bts-omldummy would reject OML Set Channel Attributes containing the hopping parameters. This change is needed for the new BSC_Tests.TC_fh_params_* test cases. Change-Id: I38692252baa7a9fc23078121db0a17557950e4d4 Related: SYS#4868, OS#4545 --- M src/osmo-bts-omldummy/bts_model.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 3fd927d..0c66934 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -177,6 +177,8 @@ int bts_model_init(struct gsm_bts *bts) { bts->variant = BTS_OSMO_OMLDUMMY; + osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); + osmo_bts_set_feature(bts->features, BTS_FEAT_HOPPING); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I38692252baa7a9fc23078121db0a17557950e4d4 Gerrit-Change-Number: 19938 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 17:26:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 17:26:00 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19949 ) Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Support handling IPv6 Transport Address in Assignment Complete Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe --- M src/libmsc/ran_msg_a.c 1 file changed, 3 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/19949/1 diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index 936cd5b..4bfd8dc 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -278,8 +278,7 @@ struct tlv_p_entry *ie_speech_codec = TLVP_GET(tp, GSM0808_IE_SPEECH_CODEC); struct tlv_p_entry *ie_codec_list_bss_supported = TLVP_GET(tp, GSM0808_IE_SPEECH_CODEC_LIST); struct tlv_p_entry *ie_osmux_cid = TLVP_GET(tp, GSM0808_IE_OSMO_OSMUX_CID); - struct sockaddr_storage rtp_addr; - struct sockaddr_in *rtp_addr_in; + struct osmo_sockaddr rtp_addr; struct gsm0808_speech_codec sc; struct gsm0808_speech_codec_list codec_list_bss_supported; int rc; @@ -290,21 +289,13 @@ if (ie_aoip_transp_addr) { /* Decode AoIP transport address element */ - rc = gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len); + rc = gsm0808_dec_aoip_trasp_addr(&rtp_addr.u.sa, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len); if (rc < 0) { LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Unable to decode AoIP Transport Layer Address\n"); return -EINVAL; } - rtp_addr_in = (struct sockaddr_in*)&rtp_addr; - - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Assignment Complete: IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - return -EINVAL; - } - - if (osmo_sockaddr_str_from_sockaddr_in(&ran_dec_msg.assignment_complete.remote_rtp, rtp_addr_in)) { + if (osmo_sockaddr_str_from_sockaddr(&ran_dec_msg.assignment_complete.remote_rtp, &rtp_addr.u.sa)) { LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Assignment Complete: unable to decode remote RTP IP address\n"); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 17:28:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 2 Sep 2020 17:28:58 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: fix missing CBCH Mobile Allocation IE References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19950 ) Change subject: SI Type 4: fix missing CBCH Mobile Allocation IE ...................................................................... SI Type 4: fix missing CBCH Mobile Allocation IE According to 3GPP TS 44.018, section 9.1.36.2, the CBCH Mobile Allocation IE shall be present if CBCH Channel Description IE indicates frequency hopping. For some reason it was missing. This change makes BSC_Tests.TC_fh_params_si4_cbch pass. Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/system_information.c 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/19950/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 7011127..2418e32 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -944,7 +944,7 @@ int rc; struct gsm48_system_information_type_4 *si4 = (struct gsm48_system_information_type_4 *) GSM_BTS_SI(bts, t); struct gsm_lchan *cbch_lchan; - uint8_t *restoct = si4->data; + uint8_t *tail = si4->data; /* length of all IEs present except SI4 rest octets and l2_plen */ int l2_plen = sizeof(*si4) - 1; @@ -963,13 +963,22 @@ /* Optional: CBCH Channel Description + CBCH Mobile Allocation */ cbch_lchan = gsm_bts_get_cbch(bts); if (cbch_lchan) { + const struct gsm_bts_trx_ts *ts = cbch_lchan->ts; struct gsm48_chan_desc cd; + + /* 10.5.2.5 (TV) CBCH Channel Description IE */ gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan); - tv_fixed_put(si4->data, GSM48_IE_CBCH_CHAN_DESC, 3, - (uint8_t *) &cd); - l2_plen += 3 + 1; - restoct += 3 + 1; - /* we don't use hopping and thus don't need a CBCH MA */ + tail = tv_fixed_put(tail, GSM48_IE_CBCH_CHAN_DESC, + sizeof(cd), (uint8_t *) &cd); + l2_plen += 1 + sizeof(cd); + + /* 10.5.2.21 (TLV) CBCH Mobile Allocation IE */ + if (ts->hopping.enabled) { + tail = tlv_put(tail, GSM48_IE_CBCH_MOB_AL, + ts->hopping.ma_len, + ts->hopping.ma_data); + l2_plen += 2 + ts->hopping.ma_len; + } } si4->header.l2_plen = GSM48_LEN2PLEN(l2_plen); @@ -977,7 +986,7 @@ /* SI4 Rest Octets (10.5.2.35), containing Optional Power offset, GPRS Indicator, Cell Identity, LSA ID, Selection Parameter */ - rc = rest_octets_si4(restoct, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - restoct); + rc = rest_octets_si4(tail, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - tail); return l2_plen + 1 + rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Gerrit-Change-Number: 19950 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 17:41:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 17:41:40 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 to look at the new patch set (#2). Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Support handling IPv6 Transport Address in Assignment Complete Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe --- M src/libmsc/ran_msg_a.c 1 file changed, 3 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/19949/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:09:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 18:09:44 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: ignore RX_SINGLE events during transmit In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 to look at the new patch set (#2). Change subject: iso7816_fsm: ignore RX_SINGLE events during transmit ...................................................................... iso7816_fsm: ignore RX_SINGLE events during transmit When logging is enabled, we get a lot of LOGL_ERROR events about RX_SINGLE events not being permitted. This is not very useful in debugging, so suppress those error messages. Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 --- M ccid_common/iso7816_fsm.c 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/48/19948/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 Gerrit-Change-Number: 19948 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:09:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 18:09:44 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: Fix APDU case with P3=0 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951 ) Change subject: iso7816_fsm: Fix APDU case with P3=0 ...................................................................... iso7816_fsm: Fix APDU case with P3=0 If P3=0 and we only receive a status word directly, we were returning a very long mostly zero-initialized buffer instead of the status word. Reason: We used msgb_put() instaed of msgb_put_u8(), so the SW1 determined the size of the message. Change-Id: I01e688db020b3b8a8735d615e653cc816caa7a13 Closes: OS#4744 --- M ccid_common/iso7816_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/51/19951/1 diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 02e7c0d..a9d6ca1 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1253,7 +1253,7 @@ osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0); } else if ((byte >= 0x60 && byte <= 0x6f) || (byte >= 0x90 && byte <= 0x9f)) { //msgb_apdu_sw(tfp->apdu) = byte << 8; - msgb_put(tfp->tpdu, byte); + msgb_put_u8(tfp->tpdu, byte); /* receive second SW byte (SW2) */ card_uart_set_rx_threshold(ip->uart, 1); card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I01e688db020b3b8a8735d615e653cc816caa7a13 Gerrit-Change-Number: 19951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:09:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 18:09:45 +0000 Subject: Change in osmo-ccid-firmware[master]: HACK: cuart: Artificially extend WTIME by 1s References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19952 ) Change subject: HACK: cuart: Artificially extend WTIME by 1s ...................................................................... HACK: cuart: Artificially extend WTIME by 1s It seems some cards take too long to respond, see https://osmocom.org/issues/4742 Change-Id: I85a7a0ae6195856fad17f249f0903f144a9aec85 Related: OS#4742 --- M ccid_common/cuart.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/52/19952/1 diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 7094a86..dc173ff 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -67,6 +67,8 @@ usecs = usecs % 1000000; } else secs = 0; + /* HACK: Some cards seem to take more time than specified? SO#4742 */ + secs += 1; osmo_timer_schedule(&cuart->wtime_tmr, secs, usecs); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I85a7a0ae6195856fad17f249f0903f144a9aec85 Gerrit-Change-Number: 19952 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:15:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 18:15:20 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19947 ) Change subject: iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3f025bc88b9aacc07ae87307328cec56efbac2ab Gerrit-Change-Number: 19947 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 18:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:15:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 18:15:29 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: Fix APDU case with P3=0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951 ) Change subject: iso7816_fsm: Fix APDU case with P3=0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I01e688db020b3b8a8735d615e653cc816caa7a13 Gerrit-Change-Number: 19951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 02 Sep 2020 18:15:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:15:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 18:15:35 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19947 ) Change subject: iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) ...................................................................... iso7816_fsm: Fix TPDUs wih Le == 1 (single byte reads) If we expect only a single byte in response to the TPDU header, the cuart driver sends us RX_SINGLE events, not RX_COMPLETE events. Change-Id: I3f025bc88b9aacc07ae87307328cec56efbac2ab Closes: OS#4741 --- M ccid_common/iso7816_fsm.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 307dac3..02e7c0d 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1273,7 +1273,12 @@ } else { card_uart_set_rx_threshold(ip->uart, tpduh->p3); card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, tpduh->p3); - osmo_fsm_inst_state_chg(fi, TPDU_S_RX_REMAINING, 0, 0); + /* if the expected length is only one byte, cuart will issue + * TPDU_S_RX_SINGLE instead of TPDU_S_RX_REMAINING (OS#4741) */ + if (tpduh->p3 == 1) + osmo_fsm_inst_state_chg(fi, TPDU_S_RX_SINGLE, 0, 0); + else + osmo_fsm_inst_state_chg(fi, TPDU_S_RX_REMAINING, 0, 0); } } else if (byte == (tpduh->ins ^ 0xFF)) { /* transmit/recieve single byte then wait for proc */ @@ -1521,7 +1526,8 @@ .name = "RX_SINGLE", .in_event_mask = S(ISO7816_E_RX_SINGLE), .out_state_mask = S(TPDU_S_INIT) | - S(TPDU_S_PROCEDURE), + S(TPDU_S_PROCEDURE) | + S(TPDU_S_SW1), .action = tpdu_s_rx_single_action, }, [TPDU_S_SW1] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3f025bc88b9aacc07ae87307328cec56efbac2ab Gerrit-Change-Number: 19947 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:15:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 2 Sep 2020 18:15:36 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: Fix APDU case with P3=0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951 ) Change subject: iso7816_fsm: Fix APDU case with P3=0 ...................................................................... iso7816_fsm: Fix APDU case with P3=0 If P3=0 and we only receive a status word directly, we were returning a very long mostly zero-initialized buffer instead of the status word. Reason: We used msgb_put() instaed of msgb_put_u8(), so the SW1 determined the size of the message. Change-Id: I01e688db020b3b8a8735d615e653cc816caa7a13 Closes: OS#4744 --- M ccid_common/iso7816_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 02e7c0d..a9d6ca1 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1253,7 +1253,7 @@ osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0); } else if ((byte >= 0x60 && byte <= 0x6f) || (byte >= 0x90 && byte <= 0x9f)) { //msgb_apdu_sw(tfp->apdu) = byte << 8; - msgb_put(tfp->tpdu, byte); + msgb_put_u8(tfp->tpdu, byte); /* receive second SW byte (SW2) */ card_uart_set_rx_threshold(ip->uart, 1); card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I01e688db020b3b8a8735d615e653cc816caa7a13 Gerrit-Change-Number: 19951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 18:18:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 18:18:17 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 to look at the new patch set (#3). Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Support handling IPv6 Transport Address in Assignment Complete Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe --- M src/libmsc/ran_msg_a.c 1 file changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/19949/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 19:02:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 19:02:29 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: copy back Connection Information from MDCX ACK References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19953 ) Change subject: mgcp_client: copy back Connection Information from MDCX ACK ...................................................................... mgcp_client: copy back Connection Information from MDCX ACK This is needed in case MGW changes the local IP address (for instance because it initlaly offered an IPv4 address, and a client submitted a remote IPv6 address, so MGW needs then to offer a local IPv6 address for the RTP connection to be possible). Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/53/19953/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c index c68d8b3..c1fc0de 100644 --- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c @@ -469,14 +469,12 @@ ci->pending = false; + rtp_info = data; + switch (ci->verb) { case MGCP_VERB_CRCX: /* If we sent a wildcarded endpoint name on CRCX, we need to store the resulting endpoint * name here. Also, we receive the MGW's RTP port information. */ - rtp_info = data; - OSMO_ASSERT(rtp_info); - ci->got_port_info = true; - ci->rtp_info = *rtp_info; osmo_strlcpy(ci->mgcp_ci_str, mgcp_conn_get_ci(ci->mgcp_client_fi), sizeof(ci->mgcp_ci_str)); if (rtp_info->endpoint[0]) { @@ -486,6 +484,15 @@ return; } ci->ep->first_crcx_complete = true; + OSMO_ASSERT(rtp_info); + /* fall through */ + case MGCP_VERB_MDCX: + /* Always update the received RTP ip/port information, since MGW + * may provide new one after remote end params changed */ + if (rtp_info) { + ci->got_port_info = true; + ci->rtp_info = *rtp_info; + } break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc Gerrit-Change-Number: 19953 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 19:15:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 2 Sep 2020 19:15:06 +0000 Subject: Change in osmo-bsc[master]: WIP: Deferr IPACC MDCX after BTS side MGCP MDCX References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19954 ) Change subject: WIP: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... WIP: Deferr IPACC MDCX after BTS side MGCP MDCX This is needed to be able to force MGW to provide an IPv4 address during MDCX, since IPACC protocol on the BTS side only supports IPv4, but one may need IPv6 side at the same time on the core side. By moving the IPACC MDCX request to a later step, the BSC gains knowledge of the local address on each side (BTS, MGW), and if they don't match (ie. BTS uses IPv4 and MGW uses IPv6), it can then get MGW to offer an IPv4 address during MGCP MDCX containing the BTS IPv4 address. At that point, the MGW can see the mismatch and provide an IPv4 address in the MGCP MDCX ACK, which can then finally be communicated to the BTS during IPACC MDCX phase. Previous order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK i (get MGW local IP addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IP addr) BSC -> BTS: IPACC MDCX (set MGW IP addr) BSC <- BTS: IPACC MDCX ACK BSC -> MGW: MDCX (set BTS IP addr) BSC <- MGW: MDCX ACK New order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK (get MGCP local IPv6 addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IPv4 addr) BSC -> MGW: MDCX (set BTS IPv4 addr) BSC <- MGW: MDCX ACK (here MGW changes its local addr to IPv6 BSC -> BTS: IPACC MDCX (set MGW IPv6 addr) BSC <- BTS: IPACC MDCX ACK TODO: Probably need to update some ladder diagrams Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 26 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/19954/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 1dd31b1..5de2967 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -301,10 +301,7 @@ switch (event) { case LCHAN_RTP_EV_IPACC_CRCX_ACK: - /* the CRCX ACK parsing has already noted the RTP port information at - * lchan->abis_ip.bound_*, see ipac_parse_rtp(). We'll use that in - * lchan_rtp_fsm_wait_mgw_endpoint_configured_onenter(). */ - lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK); + lchan_rtp_fsm_switch_rtp(fi); return; case LCHAN_RTP_EV_IPACC_CRCX_NACK: @@ -366,21 +363,16 @@ static void lchan_rtp_fsm_wait_ipacc_mdcx_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); switch (event) { case LCHAN_RTP_EV_IPACC_MDCX_ACK: - lchan_rtp_fsm_switch_rtp(fi); + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_READY); return; case LCHAN_RTP_EV_IPACC_MDCX_NACK: lchan_rtp_fail("Received NACK on IPACC MDCX"); return; - case LCHAN_RTP_EV_READY_TO_SWITCH_RTP: - lchan->activate.info.wait_before_switching_rtp = false; - return; - case LCHAN_RTP_EV_RELEASE: case LCHAN_RTP_EV_ROLLBACK: osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, 0); @@ -480,10 +472,15 @@ static void lchan_rtp_fsm_wait_mgw_endpoint_configured(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - switch (event) { + struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); + switch (event) { case LCHAN_RTP_EV_MGW_ENDPOINT_CONFIGURED: - lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_READY); + if (is_ipaccess_bts(lchan->ts->trx->bts)) + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK); + else { + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_READY); + } return; case LCHAN_RTP_EV_MGW_ENDPOINT_ERROR: @@ -652,23 +649,8 @@ | S(LCHAN_RTP_EV_ROLLBACK) , .out_state_mask = 0 - | S(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK) - , - }, - [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { - .name = "WAIT_IPACC_MDCX_ACK", - .onenter = lchan_rtp_fsm_wait_ipacc_mdcx_ack_onenter, - .action = lchan_rtp_fsm_wait_ipacc_mdcx_ack, - .in_event_mask = 0 - | S(LCHAN_RTP_EV_READY_TO_SWITCH_RTP) - | S(LCHAN_RTP_EV_IPACC_MDCX_ACK) - | S(LCHAN_RTP_EV_IPACC_MDCX_NACK) - | S(LCHAN_RTP_EV_RELEASE) - | S(LCHAN_RTP_EV_ROLLBACK) - , - .out_state_mask = 0 | S(LCHAN_RTP_ST_WAIT_READY_TO_SWITCH_RTP) - | S(LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED) + | S(LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED) /*old: LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK*/ , }, [LCHAN_RTP_ST_WAIT_READY_TO_SWITCH_RTP] = { @@ -694,6 +676,22 @@ | S(LCHAN_RTP_EV_ROLLBACK) , .out_state_mask = 0 + | S(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK) + | S(LCHAN_RTP_ST_READY) + | S(LCHAN_RTP_ST_ROLLBACK) + , + }, + [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { + .name = "WAIT_IPACC_MDCX_ACK", + .onenter = lchan_rtp_fsm_wait_ipacc_mdcx_ack_onenter, + .action = lchan_rtp_fsm_wait_ipacc_mdcx_ack, + .in_event_mask = 0 + | S(LCHAN_RTP_EV_IPACC_MDCX_ACK) + | S(LCHAN_RTP_EV_IPACC_MDCX_NACK) + | S(LCHAN_RTP_EV_RELEASE) + | S(LCHAN_RTP_EV_ROLLBACK) + , + .out_state_mask = 0 | S(LCHAN_RTP_ST_READY) | S(LCHAN_RTP_ST_ROLLBACK) , -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 20:40:56 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 2 Sep 2020 20:40:56 +0000 Subject: Change in osmo-gsm-tester[master]: enb: incorporate number of carriers into ue_max_rate() API References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955 ) Change subject: enb: incorporate number of carriers into ue_max_rate() API ...................................................................... enb: incorporate number of carriers into ue_max_rate() API this allows the enb to calculate the max rate in a single spot rather than each test individually Change-Id: Id225a986e0b271cf9c057c74c9aefd6c7f3d39d6 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M sysmocom/suites/4g/iperf3_dl.py M sysmocom/suites/4g/iperf3_ul.py 5 files changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/55/19955/1 diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 85aca35..6384f15 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -213,7 +213,7 @@ pass @abstractmethod - def ue_max_rate(self, downlink=True): + def ue_max_rate(self, downlink=True, num_carriers=1): pass @abstractmethod diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 657cb2e..f2d328d 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -251,7 +251,7 @@ rfemu_obj = rfemu.get_instance_by_type(rfemu_cfg['type'], rfemu_cfg) return rfemu_obj - def ue_max_rate(self, downlink=True): + def ue_max_rate(self, downlink=True, num_carriers=1): # The max rate for a single UE per PRB configuration in TM1 with MCS 28 QAM64 max_phy_rate_tm1_dl = { 6 : 3.2e6, 15 : 9.2e6, @@ -278,6 +278,9 @@ if self._txmode >= 2 and self.num_prb() <= 25: max_rate *= 0.85 + # Assume we schedule all carriers + max_rate *= num_carriers + return max_rate # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index aa2ec87..7556f92 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -249,10 +249,11 @@ rfemu_cfg = cell_list[cell].get('dl_rfemu', None) if rfemu_cfg is None: raise log.Error('rfemu attribute not found in cell_list item!') + rfemu_obj = rfemu.get_instance_by_type(rfemu_cfg['type'], rfemu_cfg) return rfemu_obj - def ue_max_rate(self, downlink=True): + def ue_max_rate(self, downlink=True, num_carriers=1): # The max rate for a single UE per PRB configuration in TM1 with MCS 28 QAM64 max_phy_rate_tm1_dl = { 6 : 3.5e6, 15 : 11e6, @@ -280,6 +281,9 @@ if self._txmode >= 2 and self.num_prb() == 6: max_rate *= 0.85 + # Assume we schedule all carriers + max_rate *= num_carriers + return max_rate # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py index 0d8bfcd..6f79076 100755 --- a/sysmocom/suites/4g/iperf3_dl.py +++ b/sysmocom/suites/4g/iperf3_dl.py @@ -20,8 +20,7 @@ ue.connect(enb) -max_rate = enb.ue_max_rate(downlink=True) -max_rate *= ue.num_carriers +max_rate = enb.ue_max_rate(downlink=True, num_carriers=ue.num_carriers) iperf3srv.start() proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate) diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py index 83ac465..4ae0118 100755 --- a/sysmocom/suites/4g/iperf3_ul.py +++ b/sysmocom/suites/4g/iperf3_ul.py @@ -20,8 +20,7 @@ ue.connect(enb) -max_rate = enb.ue_max_rate(downlink=False) -max_rate *= ue.num_carriers +max_rate = enb.ue_max_rate(downlink=False, num_carriers=ue.num_carriers) iperf3srv.start() proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id225a986e0b271cf9c057c74c9aefd6c7f3d39d6 Gerrit-Change-Number: 19955 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 20:40:57 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 2 Sep 2020 20:40:57 +0000 Subject: Change in osmo-gsm-tester[master]: enb_srs: expose DL AWGN channel modifier for srsENB References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19956 ) Change subject: enb_srs: expose DL AWGN channel modifier for srsENB ...................................................................... enb_srs: expose DL AWGN channel modifier for srsENB we've added the modifier to configure Amarisoft eNB channel model. This patch enables it for srsENB. Change-Id: I30e65d0431b2d2792986128287caf8b23a22b2c1 --- M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/templates/srsenb.conf.tmpl 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/56/19956/1 diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index 7556f92..68a3a19 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -194,6 +194,8 @@ self.enable_pcap = util.str2bool(values['enb'].get('enable_pcap', 'false')) config.overlay(values, dict(enb={'enable_pcap': self.enable_pcap})) + config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))})) + self._additional_args = [] for add_args in values['enb'].get('additional_args', []): self._additional_args += add_args.split() diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl index ac94313..7409b3a 100644 --- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl @@ -193,8 +193,16 @@ # hst.fd_hz: Doppler frequency in Hz # hst.init_time_s: Initial time in seconds ##################################################################### +% if enb.enable_dl_awgn: [channel.dl] -#enable = false +enable = true +% endif + +% if enb.enable_dl_awgn: +[channel.dl.awgn] +enable = true +snr = ${enb.dl_awgn_snr} +% endif [channel.dl.fading] #enable = false -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I30e65d0431b2d2792986128287caf8b23a22b2c1 Gerrit-Change-Number: 19956 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 21:53:26 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 2 Sep 2020 21:53:26 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 to look at the new patch set (#3). Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... lchan_fsm: make rsl mode-modify working again osmo-nitb supports the modification of an lchan if the lchan is compatible but in the wrong mode. This feature was dropped in the transition to AoIP/bsc-split. However, osmo-bsc still has code to generate and parse the messeages, but the FSMs do not support a mode modify yetm Lets add handling for mode-modify to the lchan_fsm and assignment_fsm in order to support mode modify again Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Related: OS#4549 --- M doc/assignment-fsm.dot M doc/assignment.msc M doc/lchan-fsm.dot M doc/lchan.msc M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/lchan_fsm.c 10 files changed, 252 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/19792/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 21:53:26 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 2 Sep 2020 21:53:26 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: prioritize emergency calls over regular calls In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 to look at the new patch set (#2). Change subject: abis_rsl: prioritize emergency calls over regular calls ...................................................................... abis_rsl: prioritize emergency calls over regular calls when an emergency call arrives while all TCH are busy, the BSC should pick an arbitrary (preferably the longest lasting) call / lchan and release it in favor of the incoming emergancy call. The release of the existing call is a process that can not be done synchronously while the ChanRQD is handled sonce multiple messages are exchanged between BTS and MSC and multiple FSMs need to do their work. To be able to release one lchan while handling a ChanRQD a queue is implemented in which the incomming channel requests are collected. If an emergency call is established while all channels are busy, an arbitrary lchan is picked and freed. When freeing the lchan is done, the queue is checked again and the emergency call is put on the free lchan (TCH/H or TCH/F). Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Related: OS#4549 --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_fsm.h M include/osmocom/bsc/lchan_select.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 8 files changed, 251 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/19793/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Gerrit-Change-Number: 19793 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 2 23:07:45 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 2 Sep 2020 23:07:45 +0000 Subject: Change in osmo-bsc[master]: drop some unused members and function decls References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19957 ) Change subject: drop some unused members and function decls ...................................................................... drop some unused members and function decls Change-Id: I0de2c8a3ee6c693a5a321f0ea2a8a75fbe64a1c2 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/osmo_bsc.h 2 files changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/19957/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index ca96c56..5e2ceae 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -261,9 +261,6 @@ /* SCCP connection associatd with this subscriber_connection */ struct { - /* for advanced ping/pong */ - int send_ping; - /* SCCP connection related */ struct bsc_msc_data *msc; diff --git a/include/osmocom/bsc/osmo_bsc.h b/include/osmocom/bsc/osmo_bsc.h index afc319b..13ccdd7 100644 --- a/include/osmocom/bsc/osmo_bsc.h +++ b/include/osmocom/bsc/osmo_bsc.h @@ -19,12 +19,6 @@ struct bsc_api *osmo_bsc_api(); -int bsc_queue_for_msc(struct gsm_subscriber_connection *conn, struct msgb *msg); -int bsc_open_connection(struct gsm_subscriber_connection *sccp, struct msgb *msg); -enum bsc_con bsc_create_new_connection(struct gsm_subscriber_connection *conn, - struct bsc_msc_data *msc, int send_ping); -int bsc_delete_connection(struct gsm_subscriber_connection *sccp); - int bsc_scan_bts_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0de2c8a3ee6c693a5a321f0ea2a8a75fbe64a1c2 Gerrit-Change-Number: 19957 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 3 01:46:36 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 Sep 2020 01:46:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f504b0ea740d_1f162ad89e29260012361c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 617s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 617s] [COMPILING libboard/qmod/source/card_pres.c] [ 617s] [COMPILING libboard/qmod/source/wwan_led.c] [ 618s] [COMPILING libboard/qmod/source/i2c.c] [ 618s] [COMPILING libboard/qmod/source/board_qmod.c] [ 618s] [COMPILING apps/dfu/main.c] [ 619s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 619s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 619s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 620s] Memory region Used Size Region Size %age Used [ 620s] rom: 16588 B 16 KB 101.25% [ 620s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 620s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 620s] collect2: error: ld returned 1 exit status [ 620s] % [ 620s] make[2]: *** [Makefile:234: flash] Error 1 [ 620s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 620s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 620s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 620s] dh_auto_build: error: make -j1 returned exit code 2 [ 620s] make: *** [debian/rules:16: build] Error 25 [ 620s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 620s] ### VM INTERACTION START ### [ 623s] [ 583.062107] sysrq: Power Off [ 623s] [ 583.109490] reboot: Power down [ 623s] ### VM INTERACTION END ### [ 623s] [ 623s] lamb21 failed "build simtrace2_0.7.0.63.39070.dsc" at Thu Sep 3 01:46:21 UTC 2020. [ 623s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Sep 3 06:29:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 06:29:51 +0000 Subject: Change in osmo-bsc[master]: drop some unused members and function decls In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19957 ) Change subject: drop some unused members and function decls ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0de2c8a3ee6c693a5a321f0ea2a8a75fbe64a1c2 Gerrit-Change-Number: 19957 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 03 Sep 2020 06:29:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:12:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:12:58 +0000 Subject: Change in osmo-ccid-firmware[master]: add copyright + license disclaimers to ccid_common + ccid_host References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19958 ) Change subject: add copyright + license disclaimers to ccid_common + ccid_host ...................................................................... add copyright + license disclaimers to ccid_common + ccid_host Change-Id: I1b0f876de337c625081dc5b579dd0a88d62c857c --- M ccid_common/ccid_device.c M ccid_common/ccid_device.h M ccid_common/ccid_proto.c M ccid_common/ccid_proto.h M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M ccid_common/iso7816_fsm.h M ccid_host/ccid_main_functionfs.c M ccid_host/ccid_slot_sim.c M ccid_host/cuart_driver_tty.c M ccid_host/cuart_fsm_test.c M ccid_host/cuart_test.c M ccid_host/hub_main_functionfs.c M ccid_host/logging.c 16 files changed, 283 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/58/19958/1 diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index 9e72e11..6574564 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -1,3 +1,22 @@ +/* CCID Device handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/ccid_device.h b/ccid_common/ccid_device.h index bcf5d12..97d6212 100644 --- a/ccid_common/ccid_device.h +++ b/ccid_common/ccid_device.h @@ -1,4 +1,23 @@ #pragma once +/* CCID Device handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include diff --git a/ccid_common/ccid_proto.c b/ccid_common/ccid_proto.c index 9a6b8fa..5265e36 100644 --- a/ccid_common/ccid_proto.c +++ b/ccid_common/ccid_proto.c @@ -1,3 +1,22 @@ +/* CCID Protocol related Definitions + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include "ccid_proto.h" diff --git a/ccid_common/ccid_proto.h b/ccid_common/ccid_proto.h index 92878dc..1c6dd07 100644 --- a/ccid_common/ccid_proto.h +++ b/ccid_common/ccid_proto.h @@ -1,4 +1,23 @@ #pragma once +/* CCID Protocol related Definitions + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 99c8c21..ba29acd 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -1,6 +1,23 @@ /* Code providing a ccid_slot_ops implementation based on iso7716_fsm, * (which in turn sits on top of card_uart) */ +/* (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 7094a86..bc99631 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -1,3 +1,22 @@ +/* Card UART handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h index 6f8ba70..e5ec501 100644 --- a/ccid_common/cuart.h +++ b/ccid_common/cuart.h @@ -1,4 +1,23 @@ #pragma once +/* Card UART handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index a9d6ca1..059950f 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1,6 +1,6 @@ /* ISO 7816-3 Finite State Machine (reader side) * - * (C) 2019 by Harald Welte + * (C) 2019-2020 by Harald Welte * * inspired by earlier work * (C) 2016-2017 by Harald Welte diff --git a/ccid_common/iso7816_fsm.h b/ccid_common/iso7816_fsm.h index d4aee59..c0ef620 100644 --- a/ccid_common/iso7816_fsm.h +++ b/ccid_common/iso7816_fsm.h @@ -1,4 +1,22 @@ #pragma once +/* ISO7816-3 Finite State Machine + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ #include struct card_uart; diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c index d3e0c3c..b538e12 100644 --- a/ccid_host/ccid_main_functionfs.c +++ b/ccid_host/ccid_main_functionfs.c @@ -1,3 +1,22 @@ +/* CCID USB Gadget - Main program using USB FunctionFS + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include diff --git a/ccid_host/ccid_slot_sim.c b/ccid_host/ccid_slot_sim.c index dc33114..c873c73 100644 --- a/ccid_host/ccid_slot_sim.c +++ b/ccid_host/ccid_slot_sim.c @@ -1,6 +1,23 @@ /* Simulated CCID card slot. This is used in absence of a real hardware back-end * in order to test the CCID firmware codebase in a virtual environment */ +/* (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c index 42a8430..38a6504 100644 --- a/ccid_host/cuart_driver_tty.c +++ b/ccid_host/cuart_driver_tty.c @@ -1,6 +1,23 @@ /* Card (ICC) UART driver for simple serial readers attached to tty. * This allows you to use the CCID core in Linux userspace against a serial reader */ +/* (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c index 38cad14..db14779 100644 --- a/ccid_host/cuart_fsm_test.c +++ b/ccid_host/cuart_fsm_test.c @@ -1,3 +1,23 @@ +/* Minimal test program for the ISO7816-3 FSM + * expects a Smart Card attached to a UART reachable as /dev/ttyXXX + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c index e2b1ce2..2a4eb2c 100644 --- a/ccid_host/cuart_test.c +++ b/ccid_host/cuart_test.c @@ -1,3 +1,24 @@ +/* Card UART (cuart) teset program + * - this tests only the CUART layer, without any FSM on top + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + + #include #include #include diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c index f350e50..1776c94 100644 --- a/ccid_host/hub_main_functionfs.c +++ b/ccid_host/hub_main_functionfs.c @@ -1,3 +1,22 @@ +/* USB Gadget simulating a USB hub over FunctionFS + * - this was used to play with limitations of the Linux kernel hub driver + * + * (C) 2019 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ #include #include diff --git a/ccid_host/logging.c b/ccid_host/logging.c index 4e14815..266d132 100644 --- a/ccid_host/logging.c +++ b/ccid_host/logging.c @@ -1,3 +1,23 @@ +/* libosmocore logging integration + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + + #include #include #include "logging.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I1b0f876de337c625081dc5b579dd0a88d62c857c Gerrit-Change-Number: 19958 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:12:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:12:59 +0000 Subject: Change in osmo-ccid-firmware[master]: add README.md to top of repository References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19959 ) Change subject: add README.md to top of repository ...................................................................... add README.md to top of repository Change-Id: Ie90114c0bce84d9d5c05ab03d3858b5c90437017 --- A README.md 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/59/19959/1 diff --git a/README.md b/README.md new file mode 100644 index 0000000..a635dec --- /dev/null +++ b/README.md @@ -0,0 +1,40 @@ +osmo-ccid-firmware - CCID implementation (not just) for firmware +================================================================ + +This repository contains a C-language implementation of the USB CCID +(Smart Card Reader) device class. The code is written in a portable +fashin and can be found in the `ccid_common` sub-directory. + +The code can be built to run as an userspace program on Linux, +implementing a USB Gadget using the FunctionFS interface. For this +version, see the `ccid_host` subdirectory. + +The CCID code can also be built into a firmware for the +[sysmoOCTSIM](https://www.sysmocom.de/products/lab/sysmooctsim/index.html) +8-slot high-performance USB smart card reader. + +Mailing List +------------ + +Discussions related to osmo-ccid-firmware are happening on the +slightly unrelated simtrace at lists.osmocom.org mailing list, please see + for subscription +options and the list archive. + +Please observe the [Osmocom Mailing List +Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules) +when posting. + +Contributing +------------ + +Our coding standards are described at + + +We us a gerrit based patch submission/review process for managing +contributions. Please see + for +more details + +The current patch queue for osmo-ccid-firmware can be seen at + -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie90114c0bce84d9d5c05ab03d3858b5c90437017 Gerrit-Change-Number: 19959 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:12:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:12:59 +0000 Subject: Change in osmo-ccid-firmware[master]: import ccid-control - small hack to send CCID USB control requests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19960 ) Change subject: import ccid-control - small hack to send CCID USB control requests ...................................................................... import ccid-control - small hack to send CCID USB control requests Change-Id: I7d6cf32e91dfd9974d2e28f13a2b062e07d17d6c --- M .gitignore A contrib/Makefile A contrib/ccid-control.c 3 files changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/60/19960/1 diff --git a/.gitignore b/.gitignore index 67d3a67..929436b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ccid_host/ccid_functionfs ccid_host/cuart_test ccid_host/hub_functionfs +contrib/ccid-control diff --git a/contrib/Makefile b/contrib/Makefile new file mode 100644 index 0000000..54d6e77 --- /dev/null +++ b/contrib/Makefile @@ -0,0 +1,12 @@ +CFLAGS=-Wall -g `pkg-config --cflags libusb-1.0` + +LDFLAGS=-lasan `pkg-config --libs libusb-1.0` + +ccid-control: ccid-control.o + $(CC) $(LDFLAGS) -o $@ $^ + +%.o: %.c + $(CC) $(CFLAGS) -o $@ -c $^ + +clean: + rm ccid-control *.o diff --git a/contrib/ccid-control.c b/contrib/ccid-control.c new file mode 100644 index 0000000..378828a --- /dev/null +++ b/contrib/ccid-control.c @@ -0,0 +1,84 @@ +/* CCID Control program + * - quick hack used to send CCID control transfers to a CCID device + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + + +#include +#include +#include +#include +#include + +static libusb_context *g_uctx; +static uint16_t g_vendor_id = 0x2342; +static uint16_t g_product_id = 0x2342; +static uint8_t g_interface = 0; + +#define GET_CLOCK_FREQS 0x02 +#define GET_DATA_RATES 0x03 + +static int usb_ctrl_get_dwords(libusb_device_handle *devh, uint8_t req_t, uint8_t rq, + uint16_t val, uint16_t index, unsigned int num_dword) +{ + uint32_t buf[num_dword]; + unsigned int i; + int rc; + + rc = libusb_control_transfer(devh, req_t, rq, val, index, (uint8_t *)buf, sizeof(buf), 1000); + if (rc < 0) { + printf("control_transfer: %s\n", libusb_strerror(rc)); + return rc; + } + + for (i = 0; i < num_dword; i++) + printf("\t%u\n", buf[i]); + + return 0; +} + + +int main(int argc, char **argv) +{ + libusb_device_handle *devh; + int rc; + + rc = libusb_init(&g_uctx); + if (rc < 0) { + fprintf(stderr, "Cannot init libusb\n"); + exit(1); + } + + devh = libusb_open_device_with_vid_pid(g_uctx, g_vendor_id, g_product_id); + if (!devh) { + fprintf(stderr, "Cannot open usb device %04x:%04x\n", g_vendor_id, g_product_id); + exit(1); + } + + printf("Clock Frequencies:\n"); + usb_ctrl_get_dwords(devh, 0xA1, GET_CLOCK_FREQS, 0, g_interface, 1); + printf("\n"); + + printf("Data Rates\n"); + usb_ctrl_get_dwords(devh, 0xA1, GET_DATA_RATES, 0, g_interface, 1); + printf("\n"); + + libusb_close(devh); + exit(0); +} + -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7d6cf32e91dfd9974d2e28f13a2b062e07d17d6c Gerrit-Change-Number: 19960 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:18:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:18:16 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid_host: Migrate to OpenMoko USB VID/PID References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961 ) Change subject: ccid_host: Migrate to OpenMoko USB VID/PID ...................................................................... ccid_host: Migrate to OpenMoko USB VID/PID We used 0x2342 just for internal testing. Let's use a proper unique allocation even for the FunctionFS version of the code. Change-Id: Idbaf173b0ec1fd80885f26b3df24a4412913c100 --- M ccid_host/README.linux-dummy_hcd-ffs M ccid_host/create_ccid_gadget.sh M contrib/ccid-control.c 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/61/19961/1 diff --git a/ccid_host/README.linux-dummy_hcd-ffs b/ccid_host/README.linux-dummy_hcd-ffs index 2b98eff..29c6584 100644 --- a/ccid_host/README.linux-dummy_hcd-ffs +++ b/ccid_host/README.linux-dummy_hcd-ffs @@ -55,7 +55,7 @@ ---- usb 3-1: new full-speed USB device number 8 using dummy_hcd -usb 3-1: New USB device found, idVendor=2342, idProduct=2342, bcdDevice= 4.19 +usb 3-1: New USB device found, idVendor=1d50, idProduct=615f, bcdDevice= 4.19 usb 3-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 3-1: Product: sysmoOCTSIM usb 3-1: Manufacturer: sysmocom GmbH @@ -76,7 +76,7 @@ 0x08C3 0x15E1 0x062D -+ 0x2342 ++ 0x1D50 ifdProductID @@ -84,7 +84,7 @@ 0x0402 0x2007 0x0001 -+ 0x2342 ++ 0x615F ifdFriendlyName diff --git a/ccid_host/create_ccid_gadget.sh b/ccid_host/create_ccid_gadget.sh index aafb152..d17b3cc 100755 --- a/ccid_host/create_ccid_gadget.sh +++ b/ccid_host/create_ccid_gadget.sh @@ -23,8 +23,8 @@ [ -d $gadgetdir ] || mkdir $gadgetdir || die "Cannot create $gadgetdir. Permission problem?" set -e -x cd $gadgetdir -echo 0x2342 > idVendor -echo 0x2342 > idProduct +echo 0x1d50 > idVendor +echo 0x615f > idProduct [ -d strings/0x409 ] || mkdir strings/0x409 echo 2342 > strings/0x409/serialnumber echo "sysmocom GmbH" > strings/0x409/manufacturer diff --git a/contrib/ccid-control.c b/contrib/ccid-control.c index 378828a..d28ddfc 100644 --- a/contrib/ccid-control.c +++ b/contrib/ccid-control.c @@ -26,8 +26,8 @@ #include static libusb_context *g_uctx; -static uint16_t g_vendor_id = 0x2342; -static uint16_t g_product_id = 0x2342; +static uint16_t g_vendor_id = 0x1d50; +static uint16_t g_product_id = 0x615f; static uint8_t g_interface = 0; #define GET_CLOCK_FREQS 0x02 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Idbaf173b0ec1fd80885f26b3df24a4412913c100 Gerrit-Change-Number: 19961 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:18:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:18:54 +0000 Subject: Change in osmo-ccid-firmware[master]: add copyright + license disclaimers to ccid_common + ccid_host In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19958 ) Change subject: add copyright + license disclaimers to ccid_common + ccid_host ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I1b0f876de337c625081dc5b579dd0a88d62c857c Gerrit-Change-Number: 19958 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 08:18:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:19:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:19:03 +0000 Subject: Change in osmo-ccid-firmware[master]: add README.md to top of repository In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19959 ) Change subject: add README.md to top of repository ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie90114c0bce84d9d5c05ab03d3858b5c90437017 Gerrit-Change-Number: 19959 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 08:19:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:19:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:19:17 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: ignore RX_SINGLE events during transmit In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 ) Change subject: iso7816_fsm: ignore RX_SINGLE events during transmit ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 Gerrit-Change-Number: 19948 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 08:19:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:19:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:19:23 +0000 Subject: Change in osmo-ccid-firmware[master]: import ccid-control - small hack to send CCID USB control requests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19960 ) Change subject: import ccid-control - small hack to send CCID USB control requests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7d6cf32e91dfd9974d2e28f13a2b062e07d17d6c Gerrit-Change-Number: 19960 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 08:19:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:19:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:19:42 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid_host: Migrate to OpenMoko USB VID/PID In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961 ) Change subject: ccid_host: Migrate to OpenMoko USB VID/PID ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Idbaf173b0ec1fd80885f26b3df24a4412913c100 Gerrit-Change-Number: 19961 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 08:19:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:20:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:20:01 +0000 Subject: Change in osmo-ccid-firmware[master]: add copyright + license disclaimers to ccid_common + ccid_host In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19958 ) Change subject: add copyright + license disclaimers to ccid_common + ccid_host ...................................................................... add copyright + license disclaimers to ccid_common + ccid_host Change-Id: I1b0f876de337c625081dc5b579dd0a88d62c857c --- M ccid_common/ccid_device.c M ccid_common/ccid_device.h M ccid_common/ccid_proto.c M ccid_common/ccid_proto.h M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M ccid_common/iso7816_fsm.h M ccid_host/ccid_main_functionfs.c M ccid_host/ccid_slot_sim.c M ccid_host/cuart_driver_tty.c M ccid_host/cuart_fsm_test.c M ccid_host/cuart_test.c M ccid_host/hub_main_functionfs.c M ccid_host/logging.c 16 files changed, 283 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index 9e72e11..6574564 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -1,3 +1,22 @@ +/* CCID Device handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/ccid_device.h b/ccid_common/ccid_device.h index bcf5d12..97d6212 100644 --- a/ccid_common/ccid_device.h +++ b/ccid_common/ccid_device.h @@ -1,4 +1,23 @@ #pragma once +/* CCID Device handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include diff --git a/ccid_common/ccid_proto.c b/ccid_common/ccid_proto.c index 9a6b8fa..5265e36 100644 --- a/ccid_common/ccid_proto.c +++ b/ccid_common/ccid_proto.c @@ -1,3 +1,22 @@ +/* CCID Protocol related Definitions + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include "ccid_proto.h" diff --git a/ccid_common/ccid_proto.h b/ccid_common/ccid_proto.h index 92878dc..1c6dd07 100644 --- a/ccid_common/ccid_proto.h +++ b/ccid_common/ccid_proto.h @@ -1,4 +1,23 @@ #pragma once +/* CCID Protocol related Definitions + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 99c8c21..ba29acd 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -1,6 +1,23 @@ /* Code providing a ccid_slot_ops implementation based on iso7716_fsm, * (which in turn sits on top of card_uart) */ +/* (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 7094a86..bc99631 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -1,3 +1,22 @@ +/* Card UART handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h index 6f8ba70..e5ec501 100644 --- a/ccid_common/cuart.h +++ b/ccid_common/cuart.h @@ -1,4 +1,23 @@ #pragma once +/* Card UART handling + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index a9d6ca1..059950f 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1,6 +1,6 @@ /* ISO 7816-3 Finite State Machine (reader side) * - * (C) 2019 by Harald Welte + * (C) 2019-2020 by Harald Welte * * inspired by earlier work * (C) 2016-2017 by Harald Welte diff --git a/ccid_common/iso7816_fsm.h b/ccid_common/iso7816_fsm.h index d4aee59..c0ef620 100644 --- a/ccid_common/iso7816_fsm.h +++ b/ccid_common/iso7816_fsm.h @@ -1,4 +1,22 @@ #pragma once +/* ISO7816-3 Finite State Machine + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ #include struct card_uart; diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c index d3e0c3c..b538e12 100644 --- a/ccid_host/ccid_main_functionfs.c +++ b/ccid_host/ccid_main_functionfs.c @@ -1,3 +1,22 @@ +/* CCID USB Gadget - Main program using USB FunctionFS + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include diff --git a/ccid_host/ccid_slot_sim.c b/ccid_host/ccid_slot_sim.c index dc33114..c873c73 100644 --- a/ccid_host/ccid_slot_sim.c +++ b/ccid_host/ccid_slot_sim.c @@ -1,6 +1,23 @@ /* Simulated CCID card slot. This is used in absence of a real hardware back-end * in order to test the CCID firmware codebase in a virtual environment */ +/* (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c index 42a8430..38a6504 100644 --- a/ccid_host/cuart_driver_tty.c +++ b/ccid_host/cuart_driver_tty.c @@ -1,6 +1,23 @@ /* Card (ICC) UART driver for simple serial readers attached to tty. * This allows you to use the CCID core in Linux userspace against a serial reader */ +/* (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c index 38cad14..db14779 100644 --- a/ccid_host/cuart_fsm_test.c +++ b/ccid_host/cuart_fsm_test.c @@ -1,3 +1,23 @@ +/* Minimal test program for the ISO7816-3 FSM + * expects a Smart Card attached to a UART reachable as /dev/ttyXXX + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + #include #include #include diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c index e2b1ce2..2a4eb2c 100644 --- a/ccid_host/cuart_test.c +++ b/ccid_host/cuart_test.c @@ -1,3 +1,24 @@ +/* Card UART (cuart) teset program + * - this tests only the CUART layer, without any FSM on top + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + + #include #include #include diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c index f350e50..1776c94 100644 --- a/ccid_host/hub_main_functionfs.c +++ b/ccid_host/hub_main_functionfs.c @@ -1,3 +1,22 @@ +/* USB Gadget simulating a USB hub over FunctionFS + * - this was used to play with limitations of the Linux kernel hub driver + * + * (C) 2019 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ #include #include diff --git a/ccid_host/logging.c b/ccid_host/logging.c index 4e14815..266d132 100644 --- a/ccid_host/logging.c +++ b/ccid_host/logging.c @@ -1,3 +1,23 @@ +/* libosmocore logging integration + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + + #include #include #include "logging.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I1b0f876de337c625081dc5b579dd0a88d62c857c Gerrit-Change-Number: 19958 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:20:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:20:02 +0000 Subject: Change in osmo-ccid-firmware[master]: add README.md to top of repository In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19959 ) Change subject: add README.md to top of repository ...................................................................... add README.md to top of repository Change-Id: Ie90114c0bce84d9d5c05ab03d3858b5c90437017 --- A README.md 1 file changed, 40 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md new file mode 100644 index 0000000..a635dec --- /dev/null +++ b/README.md @@ -0,0 +1,40 @@ +osmo-ccid-firmware - CCID implementation (not just) for firmware +================================================================ + +This repository contains a C-language implementation of the USB CCID +(Smart Card Reader) device class. The code is written in a portable +fashin and can be found in the `ccid_common` sub-directory. + +The code can be built to run as an userspace program on Linux, +implementing a USB Gadget using the FunctionFS interface. For this +version, see the `ccid_host` subdirectory. + +The CCID code can also be built into a firmware for the +[sysmoOCTSIM](https://www.sysmocom.de/products/lab/sysmooctsim/index.html) +8-slot high-performance USB smart card reader. + +Mailing List +------------ + +Discussions related to osmo-ccid-firmware are happening on the +slightly unrelated simtrace at lists.osmocom.org mailing list, please see + for subscription +options and the list archive. + +Please observe the [Osmocom Mailing List +Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules) +when posting. + +Contributing +------------ + +Our coding standards are described at + + +We us a gerrit based patch submission/review process for managing +contributions. Please see + for +more details + +The current patch queue for osmo-ccid-firmware can be seen at + -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie90114c0bce84d9d5c05ab03d3858b5c90437017 Gerrit-Change-Number: 19959 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:20:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:20:02 +0000 Subject: Change in osmo-ccid-firmware[master]: iso7816_fsm: ignore RX_SINGLE events during transmit In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 ) Change subject: iso7816_fsm: ignore RX_SINGLE events during transmit ...................................................................... iso7816_fsm: ignore RX_SINGLE events during transmit When logging is enabled, we get a lot of LOGL_ERROR events about RX_SINGLE events not being permitted. This is not very useful in debugging, so suppress those error messages. Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 --- M ccid_common/iso7816_fsm.c 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 059950f..3e78fc8 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -417,6 +417,8 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(fi); OSMO_ASSERT(fi->fsm == &iso7816_3_fsm); switch (event) { + case ISO7816_E_RX_SINGLE: + return; case ISO7816_E_TX_COMPL: /* Rx of single byte is already enabled by previous card_uart_tx() call */ osmo_fsm_inst_state_chg(fi, ISO7816_S_IN_PPS_RSP, 0, 0); @@ -517,7 +519,8 @@ .name = "WAIT_PPS_RESP", .in_event_mask = S(ISO7816_E_TX_COMPL) | S(ISO7816_E_TX_ERR_IND) | - S(ISO7816_E_WTIME_EXP), + S(ISO7816_E_WTIME_EXP) | + S(ISO7816_E_RX_SINGLE), .out_state_mask = S(ISO7816_S_RESET) | S(ISO7816_S_WAIT_TPDU) | S(ISO7816_S_WAIT_PPS_RSP) | @@ -1218,6 +1221,8 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); OSMO_ASSERT(fi->fsm == &tpdu_fsm); switch (event) { + case ISO7816_E_RX_SINGLE: + return; case ISO7816_E_TX_COMPL: card_uart_set_rx_threshold(ip->uart, 1); @@ -1307,6 +1312,8 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); switch (event) { + case ISO7816_E_RX_SINGLE: + return; case ISO7816_E_TX_COMPL: card_uart_set_rx_threshold(ip->uart, 1); card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, 1); @@ -1325,6 +1332,8 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); switch (event) { + case ISO7816_E_RX_SINGLE: + return; case ISO7816_E_TX_COMPL: tfp->tpdu->l3h += 1; card_uart_set_rx_threshold(ip->uart, 1); @@ -1484,7 +1493,8 @@ }, [TPDU_S_TX_HDR] = { .name = "TX_HDR", - .in_event_mask = S(ISO7816_E_TX_COMPL), + .in_event_mask = S(ISO7816_E_TX_COMPL) | + S(ISO7816_E_RX_SINGLE), .out_state_mask = S(TPDU_S_INIT) | S(TPDU_S_PROCEDURE), .action = tpdu_s_tx_hdr_action, @@ -1503,14 +1513,16 @@ }, [TPDU_S_TX_REMAINING] = { .name = "TX_REMAINING", - .in_event_mask = S(ISO7816_E_TX_COMPL), + .in_event_mask = S(ISO7816_E_TX_COMPL) | + S(ISO7816_E_RX_SINGLE), .out_state_mask = S(TPDU_S_INIT) | S(TPDU_S_SW1), .action = tpdu_s_tx_remaining_action, }, [TPDU_S_TX_SINGLE] = { .name = "TX_SINGLE", - .in_event_mask = S(ISO7816_E_TX_COMPL), + .in_event_mask = S(ISO7816_E_TX_COMPL) | + S(ISO7816_E_RX_SINGLE), .out_state_mask = S(TPDU_S_INIT) | S(TPDU_S_PROCEDURE), .action = tpdu_s_tx_single_action, -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7aec5fb2eaa76076e1bd0c6b8e8d09dc840c3630 Gerrit-Change-Number: 19948 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:20:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:20:02 +0000 Subject: Change in osmo-ccid-firmware[master]: import ccid-control - small hack to send CCID USB control requests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19960 ) Change subject: import ccid-control - small hack to send CCID USB control requests ...................................................................... import ccid-control - small hack to send CCID USB control requests Change-Id: I7d6cf32e91dfd9974d2e28f13a2b062e07d17d6c --- M .gitignore A contrib/Makefile A contrib/ccid-control.c 3 files changed, 97 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 67d3a67..929436b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ccid_host/ccid_functionfs ccid_host/cuart_test ccid_host/hub_functionfs +contrib/ccid-control diff --git a/contrib/Makefile b/contrib/Makefile new file mode 100644 index 0000000..54d6e77 --- /dev/null +++ b/contrib/Makefile @@ -0,0 +1,12 @@ +CFLAGS=-Wall -g `pkg-config --cflags libusb-1.0` + +LDFLAGS=-lasan `pkg-config --libs libusb-1.0` + +ccid-control: ccid-control.o + $(CC) $(LDFLAGS) -o $@ $^ + +%.o: %.c + $(CC) $(CFLAGS) -o $@ -c $^ + +clean: + rm ccid-control *.o diff --git a/contrib/ccid-control.c b/contrib/ccid-control.c new file mode 100644 index 0000000..378828a --- /dev/null +++ b/contrib/ccid-control.c @@ -0,0 +1,84 @@ +/* CCID Control program + * - quick hack used to send CCID control transfers to a CCID device + * + * (C) 2019-2020 by Harald Welte + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + */ + + +#include +#include +#include +#include +#include + +static libusb_context *g_uctx; +static uint16_t g_vendor_id = 0x2342; +static uint16_t g_product_id = 0x2342; +static uint8_t g_interface = 0; + +#define GET_CLOCK_FREQS 0x02 +#define GET_DATA_RATES 0x03 + +static int usb_ctrl_get_dwords(libusb_device_handle *devh, uint8_t req_t, uint8_t rq, + uint16_t val, uint16_t index, unsigned int num_dword) +{ + uint32_t buf[num_dword]; + unsigned int i; + int rc; + + rc = libusb_control_transfer(devh, req_t, rq, val, index, (uint8_t *)buf, sizeof(buf), 1000); + if (rc < 0) { + printf("control_transfer: %s\n", libusb_strerror(rc)); + return rc; + } + + for (i = 0; i < num_dword; i++) + printf("\t%u\n", buf[i]); + + return 0; +} + + +int main(int argc, char **argv) +{ + libusb_device_handle *devh; + int rc; + + rc = libusb_init(&g_uctx); + if (rc < 0) { + fprintf(stderr, "Cannot init libusb\n"); + exit(1); + } + + devh = libusb_open_device_with_vid_pid(g_uctx, g_vendor_id, g_product_id); + if (!devh) { + fprintf(stderr, "Cannot open usb device %04x:%04x\n", g_vendor_id, g_product_id); + exit(1); + } + + printf("Clock Frequencies:\n"); + usb_ctrl_get_dwords(devh, 0xA1, GET_CLOCK_FREQS, 0, g_interface, 1); + printf("\n"); + + printf("Data Rates\n"); + usb_ctrl_get_dwords(devh, 0xA1, GET_DATA_RATES, 0, g_interface, 1); + printf("\n"); + + libusb_close(devh); + exit(0); +} + -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7d6cf32e91dfd9974d2e28f13a2b062e07d17d6c Gerrit-Change-Number: 19960 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:20:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 08:20:02 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid_host: Migrate to OpenMoko USB VID/PID In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961 ) Change subject: ccid_host: Migrate to OpenMoko USB VID/PID ...................................................................... ccid_host: Migrate to OpenMoko USB VID/PID We used 0x2342 just for internal testing. Let's use a proper unique allocation even for the FunctionFS version of the code. Change-Id: Idbaf173b0ec1fd80885f26b3df24a4412913c100 --- M ccid_host/README.linux-dummy_hcd-ffs M ccid_host/create_ccid_gadget.sh M contrib/ccid-control.c 3 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_host/README.linux-dummy_hcd-ffs b/ccid_host/README.linux-dummy_hcd-ffs index 2b98eff..29c6584 100644 --- a/ccid_host/README.linux-dummy_hcd-ffs +++ b/ccid_host/README.linux-dummy_hcd-ffs @@ -55,7 +55,7 @@ ---- usb 3-1: new full-speed USB device number 8 using dummy_hcd -usb 3-1: New USB device found, idVendor=2342, idProduct=2342, bcdDevice= 4.19 +usb 3-1: New USB device found, idVendor=1d50, idProduct=615f, bcdDevice= 4.19 usb 3-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 3-1: Product: sysmoOCTSIM usb 3-1: Manufacturer: sysmocom GmbH @@ -76,7 +76,7 @@ 0x08C3 0x15E1 0x062D -+ 0x2342 ++ 0x1D50 ifdProductID @@ -84,7 +84,7 @@ 0x0402 0x2007 0x0001 -+ 0x2342 ++ 0x615F ifdFriendlyName diff --git a/ccid_host/create_ccid_gadget.sh b/ccid_host/create_ccid_gadget.sh index aafb152..d17b3cc 100755 --- a/ccid_host/create_ccid_gadget.sh +++ b/ccid_host/create_ccid_gadget.sh @@ -23,8 +23,8 @@ [ -d $gadgetdir ] || mkdir $gadgetdir || die "Cannot create $gadgetdir. Permission problem?" set -e -x cd $gadgetdir -echo 0x2342 > idVendor -echo 0x2342 > idProduct +echo 0x1d50 > idVendor +echo 0x615f > idProduct [ -d strings/0x409 ] || mkdir strings/0x409 echo 2342 > strings/0x409/serialnumber echo "sysmocom GmbH" > strings/0x409/manufacturer diff --git a/contrib/ccid-control.c b/contrib/ccid-control.c index 378828a..d28ddfc 100644 --- a/contrib/ccid-control.c +++ b/contrib/ccid-control.c @@ -26,8 +26,8 @@ #include static libusb_context *g_uctx; -static uint16_t g_vendor_id = 0x2342; -static uint16_t g_product_id = 0x2342; +static uint16_t g_vendor_id = 0x1d50; +static uint16_t g_product_id = 0x615f; static uint8_t g_interface = 0; #define GET_CLOCK_FREQS 0x02 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Idbaf173b0ec1fd80885f26b3df24a4412913c100 Gerrit-Change-Number: 19961 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 08:37:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 08:37:44 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... SI Type 4: prevent potential buffer overflow Make sure that in generate_si4() we do not corrupt other SI buffers by limiting maximum length of the Mobile Allocation to 2 octets. This would preserve at least 2 octets for the Rest Octets, what should be enough to encode at least GPRS Indicator. Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/system_information.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/19962/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 2418e32..b969989 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -974,6 +974,9 @@ /* 10.5.2.21 (TLV) CBCH Mobile Allocation IE */ if (ts->hopping.enabled) { + /* Prevent potential buffer overflow */ + if (ts->hopping.ma_len > 2) + return -ENOMEM; tail = tlv_put(tail, GSM48_IE_CBCH_MOB_AL, ts->hopping.ma_len, ts->hopping.ma_data); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:08:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:08:20 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19945 ) Change subject: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732 Gerrit-Change-Number: 19945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:09:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Deprecate unused IPv4-only API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19946 ) Change subject: mgcp_client: Deprecate unused IPv4-only API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc Gerrit-Change-Number: 19946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Thu, 03 Sep 2020 10:09:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:09:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:09:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: copy back Connection Information from MDCX ACK In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19953 ) Change subject: mgcp_client: copy back Connection Information from MDCX ACK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc Gerrit-Change-Number: 19953 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:09:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:11:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:11:10 +0000 Subject: Change in osmo-bsc[master]: vty: add a command to clear hopping ARFCN list In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19891 ) Change subject: vty: add a command to clear hopping ARFCN list ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I05b0adc407a2808e5fdfac1cf9cd4dba67daa0f0 Gerrit-Change-Number: 19891 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:11:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:11:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:11:41 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19944 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Gerrit-Change-Number: 19944 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:11:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:12:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:12:38 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: fix missing CBCH Mobile Allocation IE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19950 ) Change subject: SI Type 4: fix missing CBCH Mobile Allocation IE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Gerrit-Change-Number: 19950 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:12:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:12:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:12:56 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:12:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:13:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:13:25 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19949 ) Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:13:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:13:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:13:57 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:13:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:15:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:15:23 +0000 Subject: Change in osmo-bsc[master]: WIP: Deferr IPACC MDCX after BTS side MGCP MDCX In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19954 ) Change subject: WIP: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19954/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/19954/1//COMMIT_MSG at 22 PS1, Line 22: i typo? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:15:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:16:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:16:35 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 03 Sep 2020 10:16:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:31:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:31:01 +0000 Subject: Change in osmo-gsm-tester[master]: enb: incorporate number of carriers into ue_max_rate() API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955 ) Change subject: enb: incorporate number of carriers into ue_max_rate() API ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955/1/src/osmo_gsm_tester/obj/enb_srs.py File src/osmo_gsm_tester/obj/enb_srs.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955/1/src/osmo_gsm_tester/obj/enb_srs.py at 252 PS1, Line 252: Unrelated whitespace change -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id225a986e0b271cf9c057c74c9aefd6c7f3d39d6 Gerrit-Change-Number: 19955 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:31:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:31:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:31:20 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: prioritize emergency calls over regular calls In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19793 ) Change subject: abis_rsl: prioritize emergency calls over regular calls ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19793/2/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19793/2/src/osmo-bsc/abis_rsl.c at 1406 PS2, Line 1406: l how do we protect against Denial of Service here? I think we unconditioally append every channel request to the queue, growing it to extreme lengths. Think of somebody running a RACH DoS attack. If I read the code correctly: With the previous code in master (without a queue), I think there is stil la somewhat fair chance that a valid RACH request from a user gets a channel, as valid and invalid requests compete. With an indefinitely long queue, all of the hundreds to thousands of fake RACH requests make a very long queue, and until that queue has been fully processed, no new real RACH request has any chance of succeeding. So I think this patch would create a "DoS amplification", as it makes the situation even worse than it already is under DoS. If the queue grows beyond a certain length, the phone will have given up waiting for an IMMEDIATE ASSIGN (or IMMEDIATE ASSIGN REJECT) by the time we process the entry in the queue. So I think the entries must have a timeout that correlates with the timeout on the MS side, which in turn I believe is configured by the RACH control parameters in the system information. What about: When we dequeue the entries, we first check if the timeout already has expired. If it has, discard that queue entry and move to the next? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Gerrit-Change-Number: 19793 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:31:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:31:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:31:56 +0000 Subject: Change in osmo-bsc[master]: drop some unused members and function decls In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19957 ) Change subject: drop some unused members and function decls ...................................................................... drop some unused members and function decls Change-Id: I0de2c8a3ee6c693a5a321f0ea2a8a75fbe64a1c2 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/osmo_bsc.h 2 files changed, 0 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index ca96c56..5e2ceae 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -261,9 +261,6 @@ /* SCCP connection associatd with this subscriber_connection */ struct { - /* for advanced ping/pong */ - int send_ping; - /* SCCP connection related */ struct bsc_msc_data *msc; diff --git a/include/osmocom/bsc/osmo_bsc.h b/include/osmocom/bsc/osmo_bsc.h index afc319b..13ccdd7 100644 --- a/include/osmocom/bsc/osmo_bsc.h +++ b/include/osmocom/bsc/osmo_bsc.h @@ -19,12 +19,6 @@ struct bsc_api *osmo_bsc_api(); -int bsc_queue_for_msc(struct gsm_subscriber_connection *conn, struct msgb *msg); -int bsc_open_connection(struct gsm_subscriber_connection *sccp, struct msgb *msg); -enum bsc_con bsc_create_new_connection(struct gsm_subscriber_connection *conn, - struct bsc_msc_data *msc, int send_ping); -int bsc_delete_connection(struct gsm_subscriber_connection *sccp); - int bsc_scan_bts_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0de2c8a3ee6c693a5a321f0ea2a8a75fbe64a1c2 Gerrit-Change-Number: 19957 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:33:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:33:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add minimalistic HandoverCommand In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19939 ) Change subject: library/GSM_RR_Types: add minimalistic HandoverCommand ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I08e6d33a725f99e2c92f93153b2369c4c764c012 Gerrit-Change-Number: 19939 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:33:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:33:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:33:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19940 ) Change subject: BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6ccee0296e3f5ae13086b8e68c1709e386f59e97 Gerrit-Change-Number: 19940 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:33:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:33:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:33:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19941 ) Change subject: BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id8b1e9fb62f9deaa5517d7366271437af0fc6eef Gerrit-Change-Number: 19941 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:33:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:33:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:33:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: make f_vty_{handover, ss_action}() more flexible In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19942 ) Change subject: BSC_Tests/hopping: make f_vty_{handover,ss_action}() more flexible ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifbcc24c5a0299ba43a998ccbdd0f77bc109c6935 Gerrit-Change-Number: 19942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:33:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:34:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:34:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_handover_cmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 ) Change subject: BSC_Tests/hopping: add TC_fh_params_handover_cmd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Gerrit-Change-Number: 19943 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 10:34:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:34:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:34:27 +0000 Subject: Change in osmo-gsm-tester[master]: enb_srs: expose DL AWGN channel modifier for srsENB In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19956 ) Change subject: enb_srs: expose DL AWGN channel modifier for srsENB ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I30e65d0431b2d2792986128287caf8b23a22b2c1 Gerrit-Change-Number: 19956 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:34:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:34:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:34:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add minimalistic HandoverCommand In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19939 ) Change subject: library/GSM_RR_Types: add minimalistic HandoverCommand ...................................................................... library/GSM_RR_Types: add minimalistic HandoverCommand Similar to [1], the existing implementation [2] is unfriendly to use, so let's work this around by defining a minimalistic implementation of (RR) Handover Command. [1] If1a5244a688abed6e6de2bf3f6e19e0e28129ea5 [2] titan.ProtocolModules.MobileL3_v13.4.0 MobileL3_RRM_Types.PDU_RRM_HandoverCommand_NW_MS Change-Id: I08e6d33a725f99e2c92f93153b2369c4c764c012 Related: SYS#4868, OS#4545 --- M library/GSM_RR_Types.ttcn 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index c2c9d1b..2cb50bc 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -694,6 +694,36 @@ )" }; + /* 3GPP TS 44.018, section 9.1.15 (minimalistic implementation) */ + type record HandoverCommand { + CellDescriptionV cell_desc, + ChannelDescription chan_desc, + OCT1 ho_ref, + PowerCommandAndAccesstype_V power_cmd_acc_type, + FrequencyList_TLV freq_list_at optional, + CellChannelDescription_TV cell_chan_desc optional, + ChannelMode_TV chan1_mode optional, + ChannelMode_TV chan2_mode optional, + /* TODO: Mode of Channel Set 3..8 IE */ + MobileAllocationTLV mobile_allocation optional + /* TODO: more optional IEs... */ + } with { + variant "TAG( + freq_list_at, elementIdentifier = '05'O; + cell_chan_desc, elementIdentifier = '62'O; + chan1_mode, elementIdentifier = '63'O; + chan2_mode, elementIdentifier = '11'O; + mobile_allocation, iei = '72'O; + )" + }; + + /* 10.5.2.2 Cell Description IE */ + type record CellDescriptionV { + uint3_t bcc, /* PLMN colour code */ + uint3_t ncc, /* BS colour code */ + uint10_t bcch_arfcn + } with { variant "FIELDORDER(lsb)" }; + /* 9.1.18 */ type record ImmediateAssignment { @@ -853,6 +883,7 @@ PagingResponse paging_response, MeasurementReport meas_rep, AssignmentCommand ass_cmd, + HandoverCommand ho_cmd, octetstring other }; @@ -863,6 +894,7 @@ paging_response, header.message_type = PAGING_RESPONSE; meas_rep, header.message_type = MEASUREMENT_REPORT; ass_cmd, header.message_type = ASSIGNMENT_COMMAND; + ho_cmd, header.message_type = HANDOVER_COMMAND; other, OTHERWISE; )" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I08e6d33a725f99e2c92f93153b2369c4c764c012 Gerrit-Change-Number: 19939 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:34:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:34:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19940 ) Change subject: BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd ...................................................................... BSC_Tests/hopping: fix error message in TC_fh_params_assignment_cmd Change-Id: I6ccee0296e3f5ae13086b8e68c1709e386f59e97 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0099d5a..87e0d08 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7124,7 +7124,7 @@ /* Make sure that Cell Channel Description IE is present if FH is enabled */ if (chan_desc.h and not ispresent(l3_msg.payload.ass_cmd.cell_chan_desc)) { - setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); + setverdict(fail, "FH enabled, but Cell Channel Description IE is absent"); continue; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6ccee0296e3f5ae13086b8e68c1709e386f59e97 Gerrit-Change-Number: 19940 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:34:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:34:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19941 ) Change subject: BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() ...................................................................... BSC_Tests/hopping: fix bit-mask reduction in f_TC_fh_params_gen_tr_ma() Change-Id: Id8b1e9fb62f9deaa5517d7366271437af0fc6eef Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 87e0d08..1b37f78 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6918,7 +6918,7 @@ } /* Ensure that ma_mask is octet-aligned */ - ma_mask := substr(ma_mask, 0, ma_mask_len + 1); + ma_mask := substr(ma_mask, 0, ma_mask_len); ma_mask_len := (ma_mask_len + 8 - 1) / 8; ma_mask := f_pad_bit(ma_mask, ma_mask_len * 8, '0'B); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id8b1e9fb62f9deaa5517d7366271437af0fc6eef Gerrit-Change-Number: 19941 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:34:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 10:34:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: make f_vty_{handover, ss_action}() more flexible In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19942 ) Change subject: BSC_Tests/hopping: make f_vty_{handover,ss_action}() more flexible ...................................................................... BSC_Tests/hopping: make f_vty_{handover,ss_action}() more flexible Make it possible to call them from a testcase / function running on any kind of component, not only on MSC_ConnHdlr. Change-Id: Ifbcc24c5a0299ba43a998ccbdd0f77bc109c6935 --- M bsc/BSC_Tests.ttcn 1 file changed, 10 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 1b37f78..fb9fa68 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -4156,8 +4156,10 @@ } /* execute a "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7>" command on given Dchan */ -private function f_vty_ss_action(charstring suffix, integer bts_nr, integer trx_nr, RslChannelNr chan_nr) -runs on MSC_ConnHdlr { +private function f_vty_ss_action(TELNETasp_PT pt, charstring suffix, + uint8_t bts_nr, uint8_t trx_nr, + in RslChannelNr chan_nr) +{ /* FIXME: resolve those from component-global state */ var integer ts_nr := chan_nr.tn; var integer ss_nr; @@ -4176,7 +4178,7 @@ var charstring cmd := "bts "&int2str(bts_nr)&" trx "&int2str(trx_nr)& " timeslot "&int2str(ts_nr)&" sub-slot "&int2str(ss_nr)&" "; - f_vty_transceive(BSCVTY, cmd & suffix); + f_vty_transceive(pt, cmd & suffix); } /* Even though the VTY command to trigger handover takes a new BTS number as argument, behind the scenes osmo-bsc always @@ -4184,10 +4186,10 @@ * ident key (ARFCN + BSIC) in the struct passed on to handover_request(). handover_start() then resolves that to a * viable actual neighbor cell. So from the internal osmo-bsc perspective, we always request handover to an ARFCN + BSIC * pair, not really to a specific BTS number. */ -private function f_vty_handover(integer bts_nr, integer trx_nr, RslChannelNr chan_nr, - integer new_bts_nr) -runs on MSC_ConnHdlr { - f_vty_ss_action("handover " & int2str(new_bts_nr), bts_nr, trx_nr, chan_nr); +private function f_vty_handover(TELNETasp_PT pt, uint8_t bts_nr, uint8_t trx_nr, + in RslChannelNr chan_nr, uint8_t new_bts_nr) +{ + f_vty_ss_action(pt, "handover " & int2str(new_bts_nr), bts_nr, trx_nr, chan_nr); } /* intra-BSC hand-over between BTS0 and BTS1 */ @@ -4209,7 +4211,7 @@ old_chan_nr := - }; /* issue hand-over command on VTY */ - f_vty_handover(0, 0, g_chan_nr, 1); + f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); /* temporarily suspend DChan processing on BTS1 to avoid race with RSLEM_register */ f_rslem_suspend(RSL1_PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifbcc24c5a0299ba43a998ccbdd0f77bc109c6935 Gerrit-Change-Number: 19942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:41:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:41:28 +0000 Subject: Change in osmo-bsc[master]: vty: add a command to clear hopping ARFCN list In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19891 ) Change subject: vty: add a command to clear hopping ARFCN list ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I05b0adc407a2808e5fdfac1cf9cd4dba67daa0f0 Gerrit-Change-Number: 19891 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:41:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:44:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:44:16 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19944 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Gerrit-Change-Number: 19944 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:44:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:46:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:46:00 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: fix missing CBCH Mobile Allocation IE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19950 ) Change subject: SI Type 4: fix missing CBCH Mobile Allocation IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Gerrit-Change-Number: 19950 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:46:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:47:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 10:47:15 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: fix missing CBCH Mobile Allocation IE In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19950 to look at the new patch set (#2). Change subject: SI Type 4: fix missing CBCH Mobile Allocation IE ...................................................................... SI Type 4: fix missing CBCH Mobile Allocation IE According to 3GPP TS 44.018, section 9.1.36.2, the CBCH Mobile Allocation IE shall be present if CBCH Channel Description IE indicates frequency hopping. For some reason it was missing. This change makes BSC_Tests.TC_fh_params_si4_cbch pass. Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/system_information.c 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/19950/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Gerrit-Change-Number: 19950 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:47:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 10:47:15 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 to look at the new patch set (#2). Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... SI Type 4: prevent potential buffer overflow Make sure that in generate_si4() we do not corrupt other SI buffers by limiting maximum length of the Mobile Allocation to 2 octets. This would preserve at least 2 octets for the Rest Octets, what should be enough to encode at least GPRS Indicator. Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/system_information.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/19962/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:47:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 10:47:25 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Handover Command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19944 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Handover Command ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Gerrit-Change-Number: 19944 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:47:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:49:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:49:18 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... Patch Set 2: So we never send SI4 messages then? I'm not getting the rationale in this scenario. Can you please explain a bit more? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:49:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:53:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:53:38 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 03 Sep 2020 10:53:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:57:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 10:57:17 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Handover Command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19944 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Handover Command ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Gerrit-Change-Number: 19944 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 10:57:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:57:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 10:57:45 +0000 Subject: Change in osmo-bsc[master]: vty: add a command to clear hopping ARFCN list In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19891 ) Change subject: vty: add a command to clear hopping ARFCN list ...................................................................... vty: add a command to clear hopping ARFCN list Change-Id: I05b0adc407a2808e5fdfac1cf9cd4dba67daa0f0 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: 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 ef10c49..e588ba2 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4669,6 +4669,19 @@ return CMD_SUCCESS; } +DEFUN(cfg_ts_arfcn_del_all, + cfg_ts_arfcn_del_all_cmd, + "hopping arfcn del-all", + HOPPING_STR "Configure hopping ARFCN list\n" + "Delete all previously configured entries\n") +{ + struct gsm_bts_trx_ts *ts = vty->index; + + bitvec_zero(&ts->hopping.arfcns); + + return CMD_SUCCESS; +} + DEFUN(cfg_ts_e1_subslot, cfg_ts_e1_subslot_cmd, "e1 line E1_LINE timeslot <1-31> sub-slot (0|1|2|3|full)", @@ -6563,6 +6576,7 @@ install_element(TS_NODE, &cfg_ts_maio_cmd); install_element(TS_NODE, &cfg_ts_arfcn_add_cmd); install_element(TS_NODE, &cfg_ts_arfcn_del_cmd); + install_element(TS_NODE, &cfg_ts_arfcn_del_all_cmd); install_element(TS_NODE, &cfg_ts_e1_subslot_cmd); install_element(ENABLE_NODE, &drop_bts_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I05b0adc407a2808e5fdfac1cf9cd4dba67daa0f0 Gerrit-Change-Number: 19891 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:57:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 10:57:45 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Handover Command In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19944 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Handover Command ...................................................................... gsm_04_08_rr: fix hopping parameters in RR Handover Command A similar problem has already been fixed in [1]: - include GSM48_IE_MA_AFTER instead of GSM48_IE_MA_BEFORE, - fix position of the Mobile Allocation (after time) IE. This problem was uncovered by (not yet merged) TTCN-3 test case verifying handling of the hopping parameters [2]. This change makes it pass. [1] I43ef66c109b107ebcaa1cb6197637701b13b3787 [2] BSC_Tests.TC_fh_params_handover_cmd Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 10 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 69ec4d3..be114f0 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -523,23 +523,24 @@ if (new_lchan->ts->hopping.enabled) { struct gsm_bts *bts = new_lchan->ts->trx->bts; struct gsm48_system_information_type_1 *si1; - uint8_t *cur; si1 = GSM_BTS_SI(bts, SYSINFO_TYPE_1); /* Copy the Cell Chan Desc (ARFCNS in this cell) */ - msgb_put_u8(msg, GSM48_IE_CELL_CH_DESC); - cur = msgb_put(msg, GSM48_HOCMD_CCHDESC_LEN); - memcpy(cur, si1->cell_channel_description, - GSM48_HOCMD_CCHDESC_LEN); - /* Copy the Mobile Allocation */ - msgb_tlv_put(msg, GSM48_IE_MA_BEFORE, - new_lchan->ts->hopping.ma_len, - new_lchan->ts->hopping.ma_data); + msgb_tv_fixed_put(msg, GSM48_IE_CELL_CH_DESC, + GSM48_HOCMD_CCHDESC_LEN, + si1->cell_channel_description); } /* FIXME: optional bits for type of synchronization? */ msgb_tv_put(msg, GSM48_IE_CHANMODE_1, new_lchan->tch_mode); + /* Mobile Allocation (after time), TLV (see 3GPP TS 44.018, 10.5.2.21) */ + if (new_lchan->ts->hopping.enabled) { + msgb_tlv_put(msg, GSM48_IE_MA_AFTER, + new_lchan->ts->hopping.ma_len, + new_lchan->ts->hopping.ma_data); + } + /* in case of multi rate we need to attach a config */ if (new_lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) msgb_tlv_put(msg, GSM48_IE_MUL_RATE_CFG, new_lchan->mr_ms_lv[0], -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7569eead9760b6fd4bb91fc2d8d0b8200bebe374 Gerrit-Change-Number: 19944 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 10:57:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 10:57:46 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: fix missing CBCH Mobile Allocation IE In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19950 ) Change subject: SI Type 4: fix missing CBCH Mobile Allocation IE ...................................................................... SI Type 4: fix missing CBCH Mobile Allocation IE According to 3GPP TS 44.018, section 9.1.36.2, the CBCH Mobile Allocation IE shall be present if CBCH Channel Description IE indicates frequency hopping. For some reason it was missing. This change makes BSC_Tests.TC_fh_params_si4_cbch pass. Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/system_information.c 1 file changed, 16 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 7011127..2418e32 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -944,7 +944,7 @@ int rc; struct gsm48_system_information_type_4 *si4 = (struct gsm48_system_information_type_4 *) GSM_BTS_SI(bts, t); struct gsm_lchan *cbch_lchan; - uint8_t *restoct = si4->data; + uint8_t *tail = si4->data; /* length of all IEs present except SI4 rest octets and l2_plen */ int l2_plen = sizeof(*si4) - 1; @@ -963,13 +963,22 @@ /* Optional: CBCH Channel Description + CBCH Mobile Allocation */ cbch_lchan = gsm_bts_get_cbch(bts); if (cbch_lchan) { + const struct gsm_bts_trx_ts *ts = cbch_lchan->ts; struct gsm48_chan_desc cd; + + /* 10.5.2.5 (TV) CBCH Channel Description IE */ gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan); - tv_fixed_put(si4->data, GSM48_IE_CBCH_CHAN_DESC, 3, - (uint8_t *) &cd); - l2_plen += 3 + 1; - restoct += 3 + 1; - /* we don't use hopping and thus don't need a CBCH MA */ + tail = tv_fixed_put(tail, GSM48_IE_CBCH_CHAN_DESC, + sizeof(cd), (uint8_t *) &cd); + l2_plen += 1 + sizeof(cd); + + /* 10.5.2.21 (TLV) CBCH Mobile Allocation IE */ + if (ts->hopping.enabled) { + tail = tlv_put(tail, GSM48_IE_CBCH_MOB_AL, + ts->hopping.ma_len, + ts->hopping.ma_data); + l2_plen += 2 + ts->hopping.ma_len; + } } si4->header.l2_plen = GSM48_LEN2PLEN(l2_plen); @@ -977,7 +986,7 @@ /* SI4 Rest Octets (10.5.2.35), containing Optional Power offset, GPRS Indicator, Cell Identity, LSA ID, Selection Parameter */ - rc = rest_octets_si4(restoct, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - restoct); + rc = rest_octets_si4(tail, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - tail); return l2_plen + 1 + rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 Gerrit-Change-Number: 19950 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 11:05:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 11:05:57 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... Patch Set 2: > Patch Set 2: > > So we never send SI4 messages then? I'm not getting the rationale in this scenario. Can you please explain a bit more? Well, I think it's up to the caller of generate_si4() to decide what to do. As far as I can see from the code, gsm_generate_si() would log an error message and propagate -ENOMEM to gsm_bts_trx_set_system_infos(). The later in its turn would propagate the error to gsm_bts_set_system_infos()... oh, and here I realized that we do not check it's return value :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 11:05:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 11:07:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 11:07:27 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... Patch Set 2: But, I mean, how si this supposed to work if mobile allocation is bigger than 2? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 11:07:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 11:08:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 11:08:40 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... Patch Set 2: > Patch Set 2: > > But, I mean, how si this supposed to work if mobile allocation is bigger than 2? IMHO, we should consider this as a misconfiguration and prevent osmo-bsc from starting. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 11:08:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 12:24:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 12:24:20 +0000 Subject: Change in osmo-bsc[master]: vty: propagate result of gsm_bts_set_system_infos() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19963 ) Change subject: vty: propagate result of gsm_bts_set_system_infos() ...................................................................... vty: propagate result of gsm_bts_set_system_infos() We should not return CMD_SUCCESS if this functions fails. Change-Id: Id8a761593fe89cc07c2fb6e69558f44494537c47 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/19963/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index e588ba2..3524506 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3684,7 +3684,11 @@ if (acc_ramp_is_enabled(&bts->acc_ramp)) { acc_ramp_abort(&bts->acc_ramp); acc_ramp_set_enabled(&bts->acc_ramp, false); - gsm_bts_set_system_infos(bts); + if (gsm_bts_set_system_infos(bts) != 0) { + vty_out(vty, "%% Filed to (re)generate System Information " + "messages, check the logs%s", VTY_NEWLINE); + return CMD_WARNING; + } } return CMD_SUCCESS; @@ -4828,7 +4832,11 @@ return CMD_WARNING; } - gsm_bts_set_system_infos(bts); + if (gsm_bts_set_system_infos(bts) != 0) { + vty_out(vty, "%% Filed to (re)generate System Information " + "messages, check the logs%s", VTY_NEWLINE); + return CMD_WARNING; + } return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id8a761593fe89cc07c2fb6e69558f44494537c47 Gerrit-Change-Number: 19963 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 12:24:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 12:24:20 +0000 Subject: Change in osmo-bsc[master]: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19964 ) Change subject: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() ...................................................................... fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() Ensure that osmo-bsc would not continue to work as usual, if for some reason we cannot encode or send System Information messages. Change-Id: I7d3458fb10760e33411f2074a6b2df1c257438d5 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/19964/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 95eab4a..9fcdd72 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -311,7 +311,10 @@ if (trx_is_usable(trx)) acc_ramp_trigger(&trx->bts->acc_ramp); - gsm_bts_trx_set_system_infos(trx); + if (gsm_bts_trx_set_system_infos(trx) != 0) { + LOG_TRX(trx, DRSL, LOGL_ERROR, "Failed to generate System Information\n"); + return; + } if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { /* channel unspecific, power reduction in 2 dB steps */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7d3458fb10760e33411f2074a6b2df1c257438d5 Gerrit-Change-Number: 19964 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 12:24:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 12:24:20 +0000 Subject: Change in osmo-bsc[master]: abis_om2000: check result of gsm_bts_trx_set_system_infos() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19965 ) Change subject: abis_om2000: check result of gsm_bts_trx_set_system_infos() ...................................................................... abis_om2000: check result of gsm_bts_trx_set_system_infos() Ensure that osmo-bsc would not continue to work as usual, if for some reason we cannot encode or send System Information messages. Introduce transitional state OM2K_TRX_S_SEND_SI, from where we can generate and send System Information messages. Otherwise it's confusing if we fail to do something when we're already in state OM2K_TRX_S_DONE. Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/19965/1 diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 5c8b378..802cdb8 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -2122,6 +2122,7 @@ OM2K_TRX_S_WAIT_TX, OM2K_TRX_S_WAIT_RX, OM2K_TRX_S_WAIT_TS, + OM2K_TRX_S_SEND_SI, OM2K_TRX_S_DONE, OM2K_TRX_S_ERROR }; @@ -2195,14 +2196,22 @@ &ts->rbs2000.om2k_mo); } else { /* only after all 8 TS */ - osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_DONE, 0, 0); + osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_SEND_SI, 0, 0); } } +static void om2k_trx_s_send_si(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct om2k_trx_fsm_priv *otfp = fi->priv; + + if (gsm_bts_trx_set_system_infos(otfp->trx) == 0) + osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_DONE, 0, 0); + else + osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_ERROR, 0, 0); +} + static void om2k_trx_s_done_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - struct om2k_trx_fsm_priv *otfp = fi->priv; - gsm_bts_trx_set_system_infos(otfp->trx); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); } @@ -2237,10 +2246,16 @@ [OM2K_TRX_S_WAIT_TS] = { .in_event_mask = S(OM2K_TRX_EVT_TS_DONE), .out_state_mask = S(OM2K_TRX_S_ERROR) | - S(OM2K_TRX_S_DONE), + S(OM2K_TRX_S_SEND_SI), .name = "WAIT-TS", .action = om2k_trx_s_wait_ts, }, + [OM2K_TRX_S_SEND_SI] = { + .out_state_mask = S(OM2K_TRX_S_ERROR) | + S(OM2K_TRX_S_DONE), + .name = "SEND-SI", + .action = om2k_trx_s_send_si, + }, [OM2K_TRX_S_DONE] = { .name = "DONE", .onenter = om2k_trx_s_done_onenter, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 Gerrit-Change-Number: 19965 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 12:32:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 12:32:43 +0000 Subject: Change in osmo-bsc[master]: vty: propagate result of gsm_bts_set_system_infos() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19963 ) Change subject: vty: propagate result of gsm_bts_set_system_infos() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id8a761593fe89cc07c2fb6e69558f44494537c47 Gerrit-Change-Number: 19963 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 03 Sep 2020 12:32:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 12:33:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 12:33:18 +0000 Subject: Change in osmo-bsc[master]: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19964 ) Change subject: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7d3458fb10760e33411f2074a6b2df1c257438d5 Gerrit-Change-Number: 19964 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 03 Sep 2020 12:33:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 12:35:24 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 3 Sep 2020 12:35:24 +0000 Subject: Change in osmo-bsc[master]: CBSP: adjust manual to reflect new 'cbc' VTY config References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19966 ) Change subject: CBSP: adjust manual to reflect new 'cbc' VTY config ...................................................................... CBSP: adjust manual to reflect new 'cbc' VTY config Related: OS#4702 Change-Id: I101144dc4ebf151fa23d05743398aeea4a26834b --- M doc/manuals/chapters/smscb.adoc 1 file changed, 42 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/19966/1 diff --git a/doc/manuals/chapters/smscb.adoc b/doc/manuals/chapters/smscb.adoc index f7469a3..011aec4 100644 --- a/doc/manuals/chapters/smscb.adoc +++ b/doc/manuals/chapters/smscb.adoc @@ -13,7 +13,7 @@ In order to use SMSCB with OsmoBSC, you will need to -* Configure the CBSP server and/or client +* Configure OsmoBSC as either CBSP server or client * Use a channel combination including a CBCH on the BTSs === Enabling a CBCH channel combination @@ -41,41 +41,63 @@ In order to comply with the specifications, OsmoBSC supports this mode of operation as CBSP TCP server. However, to make network operation and configuration more simple, it also can operate in TCP client mode, -connecting to the CBC. This way the all the BSCs need to know is the CBC IP +connecting to the CBC. This way the BSCs need to know the CBC IP address, but not vice-versa. -The BSC can operate both CBSP TCP server and CBSP TCP client mode in -parallel. +The BSC can operate in either CBSP TCP server mode or CBSP TCP client mode. The CBC related configuration of OsmoBSC can be found in the `cbc` configuration node of the VTY interface. -.Example: Configure CBSP TCP client to connect to CBC at 1.2.3.4:48049 +The default port number for the CBSP server is 48049, according to the CBSP +specification. Hence it normally suffices to configure only the IP addresses for +the remote CBC server or the local CBSP server: + +.Example: Configure CBSP TCP client to connect to CBC at 1.2.3.4:48049 in osmo-bsc.cfg ---- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# cbc -OsmoBSC(config-cbc)# remote-ip 1.2.3.4 -OsmoBSC(config-cbc)# remote-port 48049 -OsmoBSC(config-cbc)# end +cbc + mode client + client + remote-ip 1.2.3.4 ---- -.Example: Disable CBSP TCP client +In server mode, the default configuration is 127.0.0.1:48049, so it suffices to +set `mode server` to accept CBSP connections from localhost: + ---- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# cbc -OsmoBSC(config-cbc)# no remote-ip -OsmoBSC(config-cbc)# end +cbc + mode server ---- -.Example: Configure CBSP TCP server to listen for CBC at 127.0.0.2:9999 +To also listen for inbound CBSP connections on all interfaces, both IPv4 and +IPv6: + +.Example: Configure CBSP TCP server to listen on all interfaces in osmo-bsc.cfg +---- +cbc + mode server + server + local-ip :: +---- + +Should non-standard port numbers be required, these can be configured with the +`client` / `local-port` or the `server` / `remote-port` settings. + +The `client` config also supports an explicit local bind for connecting to the +remote CBC, using `client` / `local-ip` and `local-port`. + +IP addresses for client and server can remain configured at the same time, and +the `mode` command can be used to switch between client and server operation. +The `mode` command takes immediate effect, no restart of OsmoBSC is required. +After changing `cbc` IP addresses in the telnet VTY, it is required to switch +`mode` to `disabled` and back to `client` or `server` to take effect. + +.Example: Disable the CBSP link in the telnet VTY ---- OsmoBSC> enable OsmoBSC# configure terminal OsmoBSC(config)# cbc -OsmoBSC(config-cbc)# listen-ip 127.0.0.2 -OsmoBSC(config-cbc)# listen-port 9999 +OsmoBSC(config-cbc)# mode disabled OsmoBSC(config-cbc)# end ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I101144dc4ebf151fa23d05743398aeea4a26834b Gerrit-Change-Number: 19966 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 12:35:25 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 3 Sep 2020 12:35:25 +0000 Subject: Change in osmo-bsc[master]: CBSP VTY: re-add legacy cbc config for backwards compat References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19967 ) Change subject: CBSP VTY: re-add legacy cbc config for backwards compat ...................................................................... CBSP VTY: re-add legacy cbc config for backwards compat In commit [1], I replaced the way the CBSP link is configured in the VTY. But that configuration was already part of a release, hence I should only have deprecated the old commands. Re-add the legacy config as deprecated. Try to make the legacy commands take a similar effect as they previously would be intended for, i.e. switching to server/client/disabled modes, and take effect immediately when commands are read from telnet. [1] 641f7f08450f2d0c4b8e8a9f6a36b0a6b2788816 Icaa2775cc20a99227dabe38a775ff808b374cf98 "CBSP: rewrite the CBSP link setup and 'cbc' VTY section" Related: OS#4702 Change-Id: If6b742f28191b3f19ff1d87a217037a305133f4b --- M src/osmo-bsc/cbsp_link.c M tests/cbc.vty 2 files changed, 157 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/19967/1 diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index f4cdbb7..f63dab6 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -543,6 +543,91 @@ return CMD_SUCCESS; } +/* --- Deprecated 'cbc' commands for backwards compat --- */ + +DEFUN_DEPRECATED(cfg_cbc_remote_ip, cfg_cbc_remote_ip_cmd, + "remote-ip A.B.C.D", + "IP Address of the Cell Broadcast Centre\n" + "IP Address of the Cell Broadcast Centre\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/ mode%s", + VTY_NEWLINE); + osmo_sockaddr_str_from_str(&cbc->client.remote_addr, argv[0], cbc->client.remote_addr.port); + cbc->mode = BSC_CBC_LINK_MODE_CLIENT; + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + return CMD_SUCCESS; +} +DEFUN_DEPRECATED(cfg_cbc_no_remote_ip, cfg_cbc_no_remote_ip_cmd, + "no remote-ip", + NO_STR "Remove IP address of CBC; disables outbound CBSP connections\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/mode%s", + VTY_NEWLINE); + if (cbc->mode == BSC_CBC_LINK_MODE_CLIENT) { + cbc->mode = BSC_CBC_LINK_MODE_DISABLED; + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + } + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_remote_port, cfg_cbc_remote_port_cmd, + "remote-port <1-65535>", + "TCP Port number of the Cell Broadcast Centre (Default: 48049)\n" + "TCP Port number of the Cell Broadcast Centre (Default: 48049)\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/remote-port config is deprecated, instead use cbc/client/remote-port%s", + VTY_NEWLINE); + cbc->client.remote_addr.port = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_listen_port, cfg_cbc_listen_port_cmd, + "listen-port <1-65535>", + "Local TCP port at which BSC listens for incoming CBSP connections from CBC\n" + "Local TCP port at which BSC listens for incoming CBSP connections from CBC\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode%s", + VTY_NEWLINE); + cbc->mode = BSC_CBC_LINK_MODE_CLIENT; + cbc->server.local_addr.port = atoi(argv[0]); + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_no_listen_port, cfg_cbc_no_listen_port_cmd, + "no listen-port", + NO_STR "Remove CBSP Listen Port; disables inbound CBSP connections\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode%s", + VTY_NEWLINE); + if (cbc->mode == BSC_CBC_LINK_MODE_CLIENT) { + cbc->mode = BSC_CBC_LINK_MODE_DISABLED; + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + } + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_listen_ip, cfg_cbc_listen_ip_cmd, + "listen-ip A.B.C.D", + "Local IP Address where BSC listens for incoming CBC connections (Default: 127.0.0.1)\n" + "Local IP Address where BSC listens for incoming CBC connections\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/listen-ip config is deprecated, instead use cbc/server/local-ip%s", + VTY_NEWLINE); + osmo_sockaddr_str_from_str(&cbc->server.local_addr, argv[0], cbc->server.local_addr.port); + return CMD_SUCCESS; +} + void cbc_vty_init(void) { install_element_ve(&show_cbc_cmd); @@ -564,4 +649,12 @@ install_element(CBC_CLIENT_NODE, &cfg_cbc_client_local_port_cmd); install_element(CBC_CLIENT_NODE, &cfg_cbc_client_no_local_ip_cmd); install_element(CBC_CLIENT_NODE, &cfg_cbc_client_no_local_port_cmd); + + /* Deprecated, for backwards compat */ + install_element(CBC_NODE, &cfg_cbc_remote_ip_cmd); + install_element(CBC_NODE, &cfg_cbc_no_remote_ip_cmd); + install_element(CBC_NODE, &cfg_cbc_remote_port_cmd); + install_element(CBC_NODE, &cfg_cbc_listen_port_cmd); + install_element(CBC_NODE, &cfg_cbc_no_listen_port_cmd); + install_element(CBC_NODE, &cfg_cbc_listen_ip_cmd); } diff --git a/tests/cbc.vty b/tests/cbc.vty index 7a4031f..116cc27 100644 --- a/tests/cbc.vty +++ b/tests/cbc.vty @@ -209,3 +209,67 @@ OsmoBSC(config-cbc)# mode disabled OsmoBSC(config-cbc)# do show cbc CBSP link is disabled + + +OsmoBSC(config-cbc)# # TEST DEPRECATED COMMANDS + +OsmoBSC(config-cbc)# remote-ip 1.2.3.4 +% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/ mode +OsmoBSC(config-cbc)# remote-port 1234 +% cbc/remote-port config is deprecated, instead use cbc/client/remote-port +OsmoBSC(config-cbc)# do show cbc +OsmoBSC is configured as CBSP Client to remote CBC at 1.2.3.4:1234 +CBSP Client Connection: Disconnected +OsmoBSC(config-cbc)# show running-config +... +cbc + mode client +... + client + remote-ip 1.2.3.4 + remote-port 1234 +... + +OsmoBSC(config-cbc)# no remote-ip +% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/mode +OsmoBSC(config-cbc)# do show cbc +CBSP link is disabled +OsmoBSC(config-cbc)# show running-config +... +cbc + mode disabled +... + client + remote-ip 1.2.3.4 + remote-port 1234 +... + +OsmoBSC(config-cbc)# listen-ip 127.0.0.2 +% cbc/listen-ip config is deprecated, instead use cbc/server/local-ip +OsmoBSC(config-cbc)# do show cbc +CBSP link is disabled +OsmoBSC(config-cbc)# listen-port 48049 +% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode +OsmoBSC(config-cbc)# do show cbc +OsmoBSC is configured as CBSP Client to remote CBC at 1.2.3.4:1234 +CBSP Client Connection: Disconnected +OsmoBSC(config-cbc)# show running-config +... +cbc + mode client + server + local-ip 127.0.0.2 + client + remote-ip 1.2.3.4 + remote-port 1234 +... + +OsmoBSC(config-cbc)# no listen-port +% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode +OsmoBSC(config-cbc)# do show cbc +CBSP link is disabled +OsmoBSC(config-cbc)# show running-config +... +cbc + mode disabled +... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If6b742f28191b3f19ff1d87a217037a305133f4b Gerrit-Change-Number: 19967 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:03:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 13:03:56 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix mgcp_rtp_end field description comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19968 ) Change subject: mgw: Fix mgcp_rtp_end field description comment ...................................................................... mgw: Fix mgcp_rtp_end field description comment Change-Id: Ieb044daaaa47572cd9a2524ea69e903200527d17 --- M include/osmocom/mgcp/mgcp_network.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/68/19968/1 diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index c08d009..c4967eb 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -78,7 +78,7 @@ /* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */ struct mgcp_rtp_end { - /* local IP address of the RTP socket */ + /* remote IP address of the RTP socket */ struct in_addr addr; /* in network byte order */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ieb044daaaa47572cd9a2524ea69e903200527d17 Gerrit-Change-Number: 19968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:03:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 13:03:57 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19969 ) Change subject: mgw: Initial IPv6 support ...................................................................... mgw: Initial IPv6 support This commit contains the bulky work of moving all address parsing to support IPv6 together with IPv4. Some specific patches required for full IPv6+IPv4 support requiring behavioral changes come after this one. Full Osmux IPv6 support is left out of the scope of this patch. Depends: libosmocore.git Ie07a38b05b7888885dba4ae795e9f3d9a561543d (> 1.4.0) Depends: libosmocore.git I59bf4b4b3ed14766a5a5285923d1ffa9fc8b2294 (> 1.4.0) Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c M tests/mgcp/mgcp_test.c 12 files changed, 281 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/19969/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 33bfe71..75e531b 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -23,6 +23,7 @@ #pragma once #include +#include #include #include #include @@ -207,4 +208,4 @@ int mgcp_create_bind(const char *source_addr, struct osmo_fd *fd, int port); -int mgcp_udp_send(int fd, struct in_addr *addr, int port, char *buf, int len); +int mgcp_udp_send(int fd, struct osmo_sockaddr *addr, int port, char *buf, int len); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 065494f..14cae25 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -26,7 +26,7 @@ #include #include -struct sockaddr_in; +struct sockaddr; struct mgcp_conn; struct mgcp_conn_rtp; struct mgcp_endpoint; @@ -42,7 +42,7 @@ struct osmo_rtp_msg_ctx { int proto; struct mgcp_conn_rtp *conn_src; - struct sockaddr_in *from_addr; + struct osmo_sockaddr *from_addr; }; #define OSMO_RTP_MSG_CTX(MSGB) ((struct osmo_rtp_msg_ctx*)(MSGB)->cb) diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index c4967eb..9674445 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -2,6 +2,9 @@ #include #include + +#include + #include #define MGCP_DUMMY_LOAD 0x23 @@ -79,7 +82,7 @@ /* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */ struct mgcp_rtp_end { /* remote IP address of the RTP socket */ - struct in_addr addr; + struct osmo_sockaddr addr; /* in network byte order */ int rtp_port, rtcp_port; @@ -121,12 +124,12 @@ /* is this tap active (1) or not (0) */ int enabled; /* IP/port to which we're forwarding the tapped data */ - struct sockaddr_in forward; + struct osmo_sockaddr forward; }; struct mgcp_conn; -int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, +int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct osmo_sockaddr *addr, struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst); int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn); @@ -140,7 +143,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, struct msgb *msg); + struct osmo_sockaddr *addr, struct msgb *msg); void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); int mgcp_set_ip_tos(int fd, int tos); diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index 69ba3d0..99b44d1 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -1,5 +1,6 @@ #pragma once +#include #include struct mgcp_conn_rtp; @@ -13,7 +14,7 @@ int osmux_init(int role, struct mgcp_config *cfg); int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, - struct in_addr *addr, uint16_t port); + struct osmo_sockaddr *addr, uint16_t port); void conn_osmux_disable(struct mgcp_conn_rtp *conn); int conn_osmux_allocate_cid(struct mgcp_conn_rtp *conn, int osmux_cid); void conn_osmux_release_cid(struct mgcp_conn_rtp *conn); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index d52fa64..328e580 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -349,6 +349,7 @@ char *mgcp_conn_dump(struct mgcp_conn *conn) { static char str[sizeof(conn->name)+sizeof(conn->id)+256]; + char ipbuf[INET6_ADDRSTRLEN]; if (!conn) { snprintf(str, sizeof(str), "(null connection)"); @@ -362,7 +363,7 @@ "rtp:%u rtcp:%u)", conn->name, conn->id, - inet_ntoa(conn->u.rtp.end.addr), + osmo_sockaddr_ntop(&conn->u.rtp.end.addr.u.sa, ipbuf), ntohs(conn->u.rtp.end.rtp_port), ntohs(conn->u.rtp.end.rtcp_port)); break; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 712c706..756ae2a 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -77,6 +77,16 @@ static int rx_rtp(struct msgb *msg); +static bool addr_is_any(struct osmo_sockaddr *osa) { + if (osa->u.sa.sa_family == AF_INET6) { + struct in6_addr ip6_any = IN6ADDR_ANY_INIT; + return memcmp(&osa->u.sin6.sin6_addr, + &ip6_any, sizeof(ip6_any)) == 0; + } else { + return osa->u.sin.sin_addr.s_addr == 0; + } +} + /*! Determine the local rtp bind IP-address. * \param[out] addr caller provided memory to store the resulting IP-Address. * \param[in] endp mgcp endpoint, that holds a copy of the VTY parameters. @@ -89,19 +99,20 @@ { struct mgcp_endpoint *endp; + char ipbuf[INET6_ADDRSTRLEN]; int rc; endp = conn->conn->endp; /* Try probing the local IP-Address */ - if (endp->cfg->net_ports.bind_addr_probe && conn->end.addr.s_addr != 0) { - rc = osmo_sock_local_ip(addr, inet_ntoa(conn->end.addr)); + if (endp->cfg->net_ports.bind_addr_probe && !addr_is_any(&conn->end.addr)) { + rc = osmo_sock_local_ip(addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); if (rc < 0) LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "local interface auto detection failed, using configured addresses...\n"); else { LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "selected local rtp bind ip %s by probing using remote ip %s\n", - addr, inet_ntoa(conn->end.addr)); + addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); return; } } @@ -110,7 +121,7 @@ if (endp->cfg->net_ports.bind_addr) { /* Check there is a bind IP for the RTP traffic configured, * if so, use that IP-Address */ - osmo_strlcpy(addr, endp->cfg->net_ports.bind_addr, INET_ADDRSTRLEN); + osmo_strlcpy(addr, endp->cfg->net_ports.bind_addr, INET6_ADDRSTRLEN); LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "using configured rtp bind ip as local bind ip %s\n", addr); @@ -118,7 +129,7 @@ /* No specific bind IP is configured for the RTP traffic, so * assume the IP where we listen for incoming MGCP messages * as bind IP */ - osmo_strlcpy(addr, endp->cfg->source_addr, INET_ADDRSTRLEN); + osmo_strlcpy(addr, endp->cfg->source_addr, INET6_ADDRSTRLEN); LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "using mgcp bind ip as local rtp bind ip: %s\n", addr); } @@ -154,19 +165,26 @@ * \param[in] buf buffer that holds the data to be send. * \param[in] len length of the data to be sent. * \returns bytes sent, -1 on error. */ -int mgcp_udp_send(int fd, struct in_addr *addr, int port, char *buf, int len) +int mgcp_udp_send(int fd, struct osmo_sockaddr *addr, int port, char *buf, int len) { - struct sockaddr_in out; + char ipbuf[INET6_ADDRSTRLEN]; + size_t addr_len; + bool is_ipv6 = addr->u.sa.sa_family == AF_INET6; LOGP(DRTP, LOGL_DEBUG, - "sending %i bytes length packet to %s:%u ...\n", - len, inet_ntoa(*addr), ntohs(port)); + "sending %i bytes length packet to %s:%u ...\n", len, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + ntohs(port)); - out.sin_family = AF_INET; - out.sin_port = port; - memcpy(&out.sin_addr, addr, sizeof(*addr)); + if (is_ipv6) { + addr->u.sin6.sin6_port = port; + addr_len = sizeof(addr->u.sin6); + } else { + addr->u.sin.sin_port = port; + addr_len = sizeof(addr->u.sin); + } - return sendto(fd, buf, len, 0, (struct sockaddr *)&out, sizeof(out)); + return sendto(fd, buf, len, 0, &addr->u.sa, addr_len); } /*! send RTP dummy packet (to keep NAT connection open). @@ -229,12 +247,13 @@ struct mgcp_rtp_state *state, struct mgcp_rtp_stream_state *sstate, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, + struct osmo_sockaddr *addr, uint16_t seq, uint32_t timestamp, const char *text, int32_t * tsdelta_out) { int32_t tsdelta; int32_t timestamp_error; + char ipbuf[INET6_ADDRSTRLEN]; /* Not fully intialized, skip */ if (sstate->last_tsdelta == 0 && timestamp == sstate->last_timestamp) @@ -251,8 +270,9 @@ "from %s:%d\n", text, seq, state->patch.timestamp_offset, state->patch.seq_offset, - sstate->ssrc, timestamp, inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + sstate->ssrc, timestamp, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } return 0; } @@ -267,9 +287,9 @@ "The %s timestamp delta is %d " "on SSRC: %u timestamp: %u " "from %s:%d\n", - text, tsdelta, - sstate->ssrc, timestamp, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + text, tsdelta, sstate->ssrc, timestamp, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); return 0; } @@ -281,7 +301,8 @@ "on SSRC: %u timestamp: %u from %s:%d\n", text, sstate->last_tsdelta, tsdelta, sstate->ssrc, timestamp, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } } @@ -303,7 +324,8 @@ (int16_t)(seq - sstate->last_seq), (int32_t)(timestamp - sstate->last_timestamp), tsdelta, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port), + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa), state->packet_duration); } return 1; @@ -313,12 +335,13 @@ static int adjust_rtp_timestamp_offset(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, + struct osmo_sockaddr *addr, int16_t delta_seq, uint32_t in_timestamp) { int32_t tsdelta = state->packet_duration; int timestamp_offset; uint32_t out_timestamp; + char ipbuf[INET6_ADDRSTRLEN]; if (tsdelta == 0) { tsdelta = state->out_stream.last_tsdelta; @@ -327,7 +350,8 @@ "A fixed packet duration is not available, " "using last output timestamp delta instead: %d " "from %s:%d\n", tsdelta, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } else { tsdelta = rtp_end->codec->rate * 20 / 1000; LOGPENDP(endp, DRTP, LOGL_NOTICE, @@ -335,7 +359,8 @@ "are not available, " "using fixed 20ms instead: %d " "from %s:%d\n", tsdelta, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } } @@ -344,13 +369,13 @@ if (state->patch.timestamp_offset != timestamp_offset) { state->patch.timestamp_offset = timestamp_offset; - LOGPENDP(endp, DRTP, LOGL_NOTICE, "Timestamp offset change on SSRC: %u " "SeqNo delta: %d, TS offset: %d, " "from %s:%d\n", state->in_stream.ssrc, delta_seq, state->patch.timestamp_offset, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } return timestamp_offset; @@ -360,9 +385,10 @@ static int align_rtp_timestamp_offset(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, + struct osmo_sockaddr *addr, uint32_t timestamp) { + char ipbuf[INET6_ADDRSTRLEN]; int ts_error = 0; int ts_check = 0; int ptime = state->packet_duration; @@ -375,14 +401,14 @@ /* If there is an alignment error, we have to compensate it */ if (ts_error) { state->patch.timestamp_offset += ptime - ts_error; - LOGPENDP(endp, DRTP, LOGL_NOTICE, "Corrected timestamp alignment error of %d on SSRC: %u " "new TS offset: %d, " "from %s:%d\n", ts_error, state->in_stream.ssrc, - state->patch.timestamp_offset, inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + state->patch.timestamp_offset, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } /* Check we really managed to compensate the timestamp @@ -521,8 +547,9 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, struct msgb *msg) + struct osmo_sockaddr *addr, struct msgb *msg) { + char ipbuf[INET6_ADDRSTRLEN]; uint32_t arrival_time; int32_t transit; uint16_t seq; @@ -560,7 +587,8 @@ "pkt-duration: %d, from %s:%d\n", state->in_stream.ssrc, state->patch.seq_offset, state->packet_duration, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); if (state->packet_duration == 0) { state->packet_duration = rtp_end->codec->rate * 20 / 1000; @@ -568,14 +596,16 @@ "fixed packet duration is not available, " "using fixed 20ms instead: %d from %s:%d\n", state->packet_duration, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } } else if (state->in_stream.ssrc != ssrc) { LOGPENDP(endp, DRTP, LOGL_NOTICE, "SSRC changed: %u -> %u " "from %s:%d\n", state->in_stream.ssrc, rtp_hdr->ssrc, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); state->in_stream.ssrc = ssrc; if (rtp_end->force_constant_ssrc) { @@ -604,7 +634,8 @@ "SeqNo offset: %d, TS offset: %d " "from %s:%d\n", state->in_stream.ssrc, state->patch.seq_offset, state->patch.timestamp_offset, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } state->in_stream.last_tsdelta = 0; @@ -825,7 +856,7 @@ * \param[in] conn_src associated source connection. * \param[in] conn_dst associated destination connection. * \returns 0 on success, -1 on ERROR. */ -int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, +int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct osmo_sockaddr *addr, struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst) { @@ -836,6 +867,7 @@ struct mgcp_trunk *trunk = endp->trunk; struct mgcp_rtp_end *rtp_end; struct mgcp_rtp_state *rtp_state; + char ipbuf[INET6_ADDRSTRLEN]; char *dest_name; int rc; int len; @@ -886,7 +918,7 @@ "output disabled, drop to %s %s " "rtp_port:%u rtcp_port:%u\n", dest_name, - inet_ntoa(rtp_end->addr), + osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port) ); } else if (is_rtp) { @@ -932,7 +964,8 @@ LOGPENDP(endp, DRTP, LOGL_DEBUG, "process/send to %s %s " "rtp_port:%u rtcp_port:%u\n", - dest_name, inet_ntoa(rtp_end->addr), + dest_name, + osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port) ); @@ -975,7 +1008,7 @@ } else if (!trunk->omit_rtcp) { LOGPENDP(endp, DRTP, LOGL_DEBUG, "send to %s %s rtp_port:%u rtcp_port:%u\n", - dest_name, inet_ntoa(rtp_end->addr), + dest_name, osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port) ); @@ -995,10 +1028,11 @@ /* Check if the origin (addr) matches the address/port data of the RTP * connections. */ -static int check_rtp_origin(struct mgcp_conn_rtp *conn, - struct sockaddr_in *addr) +static int check_rtp_origin(struct mgcp_conn_rtp *conn, struct osmo_sockaddr *addr) { - if (conn->end.addr.s_addr == 0) { + char ipbuf[INET6_ADDRSTRLEN]; + + if (addr_is_any(&conn->end.addr)) { switch (conn->conn->mode) { case MGCP_CONN_LOOPBACK: /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP @@ -1010,7 +1044,8 @@ * MGCP port is in loopback mode, allow looping back the packet to any source. */ LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "In loopback mode and remote address not set:" - " allowing data from address: %s\n", inet_ntoa(addr->sin_addr)); + " allowing data from address: %s\n", + osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); return 0; default: @@ -1019,18 +1054,25 @@ * confuse humans with expected errors. */ LOGPCONN(conn->conn, DRTP, LOGL_INFO, "Rx RTP from %s, but remote address not set:" - " dropping early media\n", inet_ntoa(addr->sin_addr)); + " dropping early media\n", + osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); return -1; } } /* Note: Check if the inbound RTP data comes from the same host to * which we send our outgoing RTP traffic. */ - if (conn->end.addr.s_addr != addr->sin_addr.s_addr) { + if (conn->end.addr.u.sa.sa_family != addr->u.sa.sa_family || + (conn->end.addr.u.sa.sa_family == AF_INET && + conn->end.addr.u.sin.sin_addr.s_addr != addr->u.sin.sin_addr.s_addr) || + (conn->end.addr.u.sa.sa_family == AF_INET6 && + memcmp(&conn->end.addr.u.sin6.sin6_addr, &addr->u.sin6.sin6_addr, + sizeof(struct in6_addr)) == 0)) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "data from wrong address: %s, ", inet_ntoa(addr->sin_addr)); + "data from wrong address: %s, ", + osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); LOGPC(DRTP, LOGL_ERROR, "expected: %s\n", - inet_ntoa(conn->end.addr)); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "packet tossed\n"); return -1; } @@ -1039,10 +1081,11 @@ * the same as the remote port where we transmit outgoing RTP traffic * to (set by MDCX). We use this to check the origin of the data for * plausibility. */ - if (conn->end.rtp_port != addr->sin_port && - conn->end.rtcp_port != addr->sin_port) { + if (conn->end.rtp_port != osmo_sockaddr_port(&addr->u.sa) && + conn->end.rtcp_port != osmo_sockaddr_port(&addr->u.sa)) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "data from wrong source port: %d, ", ntohs(addr->sin_port)); + "data from wrong source port: %d, ", + osmo_sockaddr_port(&addr->u.sa)); LOGPC(DRTP, LOGL_ERROR, "expected: %d for RTP or %d for RTCP\n", ntohs(conn->end.rtp_port), ntohs(conn->end.rtcp_port)); @@ -1057,26 +1100,29 @@ * makes sense */ static int check_rtp_destin(struct mgcp_conn_rtp *conn) { + char ipbuf[INET6_ADDRSTRLEN]; + bool ip_is_any = addr_is_any(&conn->end.addr); + /* Note: it is legal to create a connection but never setting a port * and IP-address for outgoing data. */ - if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0 && conn->end.rtp_port == 0) { + if (ip_is_any && conn->end.rtp_port == 0) { LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "destination IP-address and rtp port is (not yet) known (%s:%u)\n", - inet_ntoa(conn->end.addr), conn->end.rtp_port); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), conn->end.rtp_port); return -1; } - if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0) { + if (ip_is_any) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "destination IP-address is invalid (%s:%u)\n", - inet_ntoa(conn->end.addr), conn->end.rtp_port); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), conn->end.rtp_port); return -1; } if (conn->end.rtp_port == 0) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "destination rtp port is invalid (%s:%u)\n", - inet_ntoa(conn->end.addr), conn->end.rtp_port); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), conn->end.rtp_port); return -1; } @@ -1147,7 +1193,6 @@ struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); enum rtp_proto proto = mc->proto; struct mgcp_conn_rtp *conn_src = mc->conn_src; - struct sockaddr_in *from_addr = mc->from_addr; struct mgcp_endpoint *endp = conn_src->conn->endp; LOGPENDP(endp, DRTP, LOGL_DEBUG, "destin conn:%s\n", @@ -1167,7 +1212,7 @@ "endpoint type is MGCP_RTP_DEFAULT, " "using mgcp_send() to forward data directly\n"); return mgcp_send(endp, proto == MGCP_PROTO_RTP, - from_addr, msg, conn_src, conn_dst); + mc->from_addr, msg, conn_src, conn_dst); case MGCP_OSMUX_BSC_NAT: case MGCP_OSMUX_BSC: LOGPENDP(endp, DRTP, LOGL_DEBUG, @@ -1197,7 +1242,7 @@ struct mgcp_conn_rtp *conn_src = mc->conn_src; struct mgcp_conn *conn = conn_src->conn; struct mgcp_conn *conn_dst; - struct sockaddr_in *from_addr = mc->from_addr; + struct osmo_sockaddr *from_addr = mc->from_addr; /*! NOTE: This callback function implements the endpoint specific * dispatch behaviour of an rtp bridge/proxy endpoint. It is assumed @@ -1216,8 +1261,19 @@ * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ if (conn->u.rtp.end.rtp_port == 0) { - conn->u.rtp.end.addr = from_addr->sin_addr; - conn->u.rtp.end.rtp_port = from_addr->sin_port; + OSMO_ASSERT(conn->u.rtp.end.addr.u.sa.sa_family == from_addr->u.sa.sa_family); + switch (from_addr->u.sa.sa_family) { + case AF_INET: + conn->u.rtp.end.addr.u.sin.sin_addr = from_addr->u.sin.sin_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin.sin_port; + break; + case AF_INET6: + conn->u.rtp.end.addr.u.sin6.sin6_addr = from_addr->u.sin6.sin6_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin6.sin6_port; + break; + default: + OSMO_ASSERT(false); + } } return mgcp_send_rtp(conn_src, msg); } @@ -1266,7 +1322,7 @@ struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); struct mgcp_conn_rtp *conn_src = mc->conn_src; struct mgcp_conn *conn = conn_src->conn; - struct sockaddr_in *from_addr = mc->from_addr; + struct osmo_sockaddr *from_addr = mc->from_addr; /* Check if the connection is in loopback mode, if yes, just send the * incoming data back to the origin */ @@ -1276,8 +1332,19 @@ * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ if (conn->u.rtp.end.rtp_port == 0) { - conn->u.rtp.end.addr = from_addr->sin_addr; - conn->u.rtp.end.rtp_port = from_addr->sin_port; + OSMO_ASSERT(conn->u.rtp.end.addr.u.sa.sa_family == from_addr->u.sa.sa_family); + switch (from_addr->u.sa.sa_family) { + case AF_INET: + conn->u.rtp.end.addr.u.sin.sin_addr = from_addr->u.sin.sin_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin.sin_port; + break; + case AF_INET6: + conn->u.rtp.end.addr.u.sin6.sin6_addr = from_addr->u.sin6.sin6_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin6.sin6_port; + break; + default: + OSMO_ASSERT(false); + } } return mgcp_send_rtp(conn_src, msg); } @@ -1331,8 +1398,9 @@ struct mgcp_conn_rtp *conn_src; struct mgcp_endpoint *endp; - struct sockaddr_in addr; + struct osmo_sockaddr addr; socklen_t slen = sizeof(addr); + char ipbuf[INET6_ADDRSTRLEN]; int ret; enum rtp_proto proto; struct osmo_rtp_msg_ctx *mc; @@ -1346,7 +1414,7 @@ proto = (fd == &conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; - ret = recvfrom(fd->fd, msgb_data(msg), msg->data_len, 0, (struct sockaddr *)&addr, &slen); + ret = recvfrom(fd->fd, msgb_data(msg), msg->data_len, 0, (struct sockaddr *)&addr.u.sa, &slen); if (ret <= 0) { LOG_CONN_RTP(conn_src, LOGL_ERROR, "recvfrom error: %s\n", strerror(errno)); @@ -1358,7 +1426,8 @@ LOG_CONN_RTP(conn_src, LOGL_DEBUG, "%s: rx %u bytes from %s:%u\n", proto == MGCP_PROTO_RTP ? "RTP" : "RTPC", - msgb_length(msg), inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); + msgb_length(msg), osmo_sockaddr_ntop(&addr.u.sa, ipbuf), + osmo_sockaddr_port(&addr.u.sa)); if ((proto == MGCP_PROTO_RTP && check_rtp(conn_src, msg)) || (proto == MGCP_PROTO_RTCP && check_rtcp(conn_src, msg))) { @@ -1383,7 +1452,10 @@ }; LOG_CONN_RTP(conn_src, LOGL_DEBUG, "msg ctx: %d %p %s\n", mc->proto, mc->conn_src, - osmo_hexdump((void*)mc->from_addr, sizeof(struct sockaddr_in))); + osmo_hexdump((void*)mc->from_addr, + mc->from_addr->u.sa.sa_family == AF_INET6 ? + sizeof(struct sockaddr_in6) : + sizeof(struct sockaddr_in))); /* Increment RX statistics */ rate_ctr_inc(&conn_src->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]); @@ -1404,7 +1476,7 @@ { struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); struct mgcp_conn_rtp *conn_src = mc->conn_src; - struct sockaddr_in *from_addr = mc->from_addr; + struct osmo_sockaddr *from_addr = mc->from_addr; struct mgcp_conn *conn = conn_src->conn; struct mgcp_trunk *trunk = conn->endp->trunk; @@ -1456,7 +1528,7 @@ { int rc; - rc = osmo_sock_init2(AF_INET, SOCK_DGRAM, IPPROTO_UDP, source_addr, port, + rc = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, source_addr, port, NULL, 0, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DRTP, LOGL_ERROR, "failed to bind UDP port (%s:%i).\n", @@ -1536,7 +1608,7 @@ { char name[512]; struct mgcp_rtp_end *end; - char local_ip_addr[INET_ADDRSTRLEN]; + char local_ip_addr[INET6_ADDRSTRLEN]; snprintf(name, sizeof(name), "%s-%s", conn->conn->name, conn->conn->id); end = &conn->end; diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 93c922d..5864c95 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -148,15 +148,20 @@ /* Lookup existing handle for a specified address, if the handle can not be * found, the function will automatically allocate one */ static struct osmux_in_handle * -osmux_handle_lookup(struct mgcp_config *cfg, struct in_addr *addr, int rem_port) +osmux_handle_lookup(struct mgcp_config *cfg, struct osmo_sockaddr *addr, int rem_port) { struct osmux_handle *h; - h = osmux_handle_find_get(addr, rem_port); + if (addr->u.sa.sa_family != AF_INET) { + LOGP(DLMGCP, LOGL_DEBUG, "IPv6 not supported in osmux yet!\n"); + return NULL; + } + + h = osmux_handle_find_get(&addr->u.sin.sin_addr, rem_port); if (h != NULL) return h->in; - h = osmux_handle_alloc(cfg, addr, rem_port); + h = osmux_handle_alloc(cfg, &addr->u.sin.sin_addr, rem_port); if (h == NULL) return NULL; @@ -236,7 +241,7 @@ { struct mgcp_conn_rtp *conn = data; struct mgcp_endpoint *endp = conn->conn->endp; - struct sockaddr_in addr = { /* FIXME: do we know the source address?? */ }; + struct osmo_sockaddr addr = { /* FIXME: do we know the source address?? */ }; struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); *mc = (struct osmo_rtp_msg_ctx){ .proto = MGCP_PROTO_RTP, @@ -275,6 +280,8 @@ static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, bool sending) { + char ipbuf[INET6_ADDRSTRLEN]; + switch(conn->osmux.state) { case OSMUX_STATE_ACTIVATING: if (osmux_enable_conn(endp, conn, &conn->end.addr, conn->end.rtp_port) < 0) { @@ -287,7 +294,8 @@ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, "Osmux %s CID %u towards %s:%u is now enabled\n", sending ? "sent" : "received", - conn->osmux.cid, inet_ntoa(conn->end.addr), + conn->osmux.cid, + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), ntohs(conn->end.rtp_port)); return 0; case OSMUX_STATE_ENABLED: @@ -433,7 +441,7 @@ * \param[in] port portnumber of the remote OSMUX endpoint (in network byte order) * \returns 0 on success, -1 on ERROR */ int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, - struct in_addr *addr, uint16_t port) + struct osmo_sockaddr *addr, uint16_t port) { /*! If osmux is enabled, initialize the output handler. This handler is * used to reconstruct the RTP flow from osmux. The RTP SSRC is @@ -444,7 +452,7 @@ * overlapping RTP SSRC traveling to the BTSes behind the BSC, * similarly, for flows traveling to the MSC. */ - struct in_addr addr_unset = {}; + struct in6_addr addr_unset = {}; static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); uint16_t osmux_dummy = endp->cfg->osmux_dummy; @@ -457,7 +465,10 @@ } /* Wait until we have the connection information from MDCX */ - if (memcmp(&conn->end.addr, &addr_unset, sizeof(addr_unset)) == 0) { + if (memcmp(&conn->end.addr, &addr_unset, + conn->end.addr.u.sa.sa_family == AF_INET6 ? + sizeof(struct in6_addr) : + sizeof(struct in_addr)) == 0) { LOGPCONN(conn->conn, DLMGCP, LOGL_INFO, "Osmux remote address/port still unknown\n"); return -1; @@ -559,6 +570,7 @@ * \returns bytes sent, -1 on error */ int osmux_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn) { + char ipbuf[INET6_ADDRSTRLEN]; struct osmux_hdr *osmuxh; int buf_len; struct in_addr addr_unset = {}; @@ -588,7 +600,8 @@ LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s:%u CID %u\n", - inet_ntoa(conn->end.addr), ntohs(conn->end.rtp_port), conn->osmux.cid); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), + ntohs(conn->end.rtp_port), conn->osmux.cid); return mgcp_udp_send(osmux_fd.fd, &conn->end.addr, conn->end.rtp_port, (char*)osmuxh, buf_len); diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 9ec4aee..1269524 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -230,7 +230,7 @@ struct msgb *sdp; int rc; struct msgb *result; - char local_ip_addr[INET_ADDRSTRLEN]; + char local_ip_addr[INET6_ADDRSTRLEN]; sdp = msgb_alloc_headroom(4096, 128, "sdp record"); if (!sdp) diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 1c3c89a..e98ca94 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -21,6 +21,9 @@ */ #include +#include +#include + #include #include #include @@ -259,6 +262,42 @@ return -EINVAL; } + +static int audio_ip_from_sdp(struct osmo_sockaddr *dst_addr, char *sdp) +{ + bool is_ipv6; + char ipbuf[INET6_ADDRSTRLEN]; + if (strncmp("c=IN IP", sdp, 7) != 0) + return -1; + sdp += 7; + if (*sdp == '6') + is_ipv6 = true; + else if (*sdp == '4') + is_ipv6 = false; + else + return -1; + sdp++; + if (*sdp != ' ') + return -1; + sdp++; + if (is_ipv6) { + /* 45 = INET6_ADDRSTRLEN -1 */ + if (sscanf(sdp, "%45s", ipbuf) != 1) + return -1; + if (inet_pton(AF_INET6, ipbuf, &dst_addr->u.sin6.sin6_addr) != 1) + return -1; + dst_addr->u.sa.sa_family = AF_INET6; + } else { + /* 15 = INET_ADDRSTRLEN -1 */ + if (sscanf(sdp, "%15s", ipbuf) != 1) + return -1; + if (inet_pton(AF_INET, ipbuf, &dst_addr->u.sin.sin_addr) != 1) + return -1; + dst_addr->u.sa.sa_family = AF_INET; + } + return 0; +} + /* Pick optional fmtp parameters by payload type, if there are no fmtp * parameters, a nullpointer is returned */ static struct mgcp_codec_param *param_by_pt(int pt, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len) @@ -289,6 +328,7 @@ struct sdp_fmtp_param fmtp_params[MGCP_MAX_CODECS]; unsigned int fmtp_used = 0; struct mgcp_codec_param *codec_param; + char ipbuf[INET6_ADDRSTRLEN]; char *line; unsigned int i; void *tmp_ctx = talloc_new(NULL); @@ -298,7 +338,6 @@ int ptime, ptime2 = 0; char audio_name[64]; int port, rc; - char ipv4[16]; OSMO_ASSERT(endp); OSMO_ASSERT(conn); @@ -355,10 +394,8 @@ codecs_used = rc; break; case 'c': - - if (sscanf(line, "c=IN IP4 %15s", ipv4) == 1) { - inet_aton(ipv4, &rtp->addr); - } + if (audio_ip_from_sdp(&rtp->addr, line) < 0) + return -1; break; default: if (p->endp) @@ -393,7 +430,7 @@ LOGPCONN(conn->conn, DLMGCP, LOGL_NOTICE, "Got media info via SDP: port:%d, addr:%s, duration:%d, payload-types:", - ntohs(rtp->rtp_port), inet_ntoa(rtp->addr), + ntohs(rtp->rtp_port), osmo_sockaddr_ntop(&rtp->addr.u.sa, ipbuf), rtp->packet_duration_ms); if (codecs_used == 0) LOGPC(DLMGCP, LOGL_NOTICE, "none"); @@ -529,6 +566,7 @@ int local_port; struct sdp_fmtp_param fmtp_params[1]; unsigned int fmtp_params_len = 0; + bool addr_is_v6; OSMO_ASSERT(endp); OSMO_ASSERT(conn); @@ -543,12 +581,16 @@ audio_name = codec->audio_name; payload_type = codec->payload_type; + addr_is_v6 = osmo_ip_str_type(addr) == AF_INET6; + rc = msgb_printf(sdp, "v=0\r\n" - "o=- %s 23 IN IP4 %s\r\n" + "o=- %s 23 IN IP%c %s\r\n" "s=-\r\n" - "c=IN IP4 %s\r\n" - "t=0 0\r\n", conn->conn->id, addr, addr); + "c=IN IP%c %s\r\n" + "t=0 0\r\n", conn->conn->id, + addr_is_v6 ? '6' : '4', addr, + addr_is_v6 ? '6' : '4', addr); if (rc < 0) goto buffer_too_small; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 22863c7..8ea1cdd 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -22,6 +22,7 @@ */ #include +#include #include #include #include @@ -407,9 +408,11 @@ DEFUN(cfg_mgcp_local_ip, cfg_mgcp_local_ip_cmd, - "local ip A.B.C.D", + "local ip " VTY_IPV46_CMD, "Local options for the SDP record\n" - IP_STR "IPv4 Address to use in SDP record\n") + IP_STR + "IPv4 Address to use in SDP record\n" + "IPv6 Address to use in SDP record\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->local_ip, argv[0]); return CMD_SUCCESS; @@ -418,7 +421,10 @@ #define BIND_STR "Listen/Bind related socket option\n" DEFUN(cfg_mgcp_bind_ip, cfg_mgcp_bind_ip_cmd, - "bind ip A.B.C.D", BIND_STR IP_STR "IPv4 Address to bind to\n") + "bind ip " VTY_IPV46_CMD, + BIND_STR IP_STR + "IPv4 Address to bind to\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->source_addr, argv[0]); return CMD_SUCCESS; @@ -494,8 +500,10 @@ DEFUN(cfg_mgcp_rtp_bind_ip, cfg_mgcp_rtp_bind_ip_cmd, - "rtp bind-ip A.B.C.D", - RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") + "rtp bind-ip " VTY_IPV46_CMD, + RTP_STR "Bind endpoints facing the Network\n" + "IPv4 Address to bind to\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr, argv[0]); return CMD_SUCCESS; @@ -850,11 +858,13 @@ return CMD_SUCCESS; } -#define CALL_AGENT_STR "Callagent information\n" +#define CALL_AGENT_STR "Call agent information\n" DEFUN(cfg_mgcp_agent_addr, cfg_mgcp_agent_addr_cmd, - "call-agent ip A.B.C.D", - CALL_AGENT_STR IP_STR "IPv4 Address of the callagent\n") + "call-agent ip " VTY_IPV46_CMD, + CALL_AGENT_STR IP_STR + "IPv4 Address of the call agent\n" + "IPv6 Address of the call agent\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->call_agent_addr, argv[0]); return CMD_SUCCESS; @@ -1236,13 +1246,15 @@ DEFUN(tap_rtp, tap_rtp_cmd, - "tap-rtp <0-64> ENDPOINT CONN (in|out) A.B.C.D <0-65534>", + "tap-rtp <0-64> ENDPOINT CONN (in|out) " VTY_IPV46_CMD " <0-65534>", "Forward data on endpoint to a different system\n" "Trunk number\n" "The endpoint in hex\n" "The connection id in hex\n" "Forward incoming data\n" "Forward leaving data\n" - "destination IP of the data\n" "destination port\n") + "Destination IPv4 of the data\n" + "Destination IPv6 of the data\n" + "Destination port\n") { struct mgcp_rtp_tap *tap; struct mgcp_trunk *trunk; @@ -1290,8 +1302,22 @@ } memset(&tap->forward, 0, sizeof(tap->forward)); - inet_aton(argv[4], &tap->forward.sin_addr); - tap->forward.sin_port = htons(atoi(argv[5])); + + tap->forward.u.sa.sa_family = osmo_ip_str_type(argv[4]); + switch (tap->forward.u.sa.sa_family) { + case AF_INET: + if (inet_pton(AF_INET, argv[4], &tap->forward.u.sin.sin_addr) != 1) + return CMD_WARNING; + tap->forward.u.sin.sin_port = htons(atoi(argv[5])); + break; + case AF_INET6: + if (inet_pton(AF_INET6, argv[4], &tap->forward.u.sin6.sin6_addr) != 1) + return CMD_WARNING; + tap->forward.u.sin6.sin6_port = htons(atoi(argv[5])); + break; + default: + return CMD_WARNING; + } tap->enabled = 1; return CMD_SUCCESS; } @@ -1407,7 +1433,10 @@ DEFUN(cfg_mgcp_osmux_ip, cfg_mgcp_osmux_ip_cmd, - "osmux bind-ip A.B.C.D", OSMUX_STR IP_STR "IPv4 Address to bind to\n") + "osmux bind-ip " VTY_IPV46_CMD, + OSMUX_STR IP_STR + "IPv4 Address to bind to\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr, argv[0]); return CMD_SUCCESS; diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 7f4df2e..37357a0 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -179,7 +179,7 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what) { - struct sockaddr_in addr; + struct osmo_sockaddr addr; socklen_t slen = sizeof(addr); struct msgb *msg; struct msgb *resp; @@ -205,7 +205,7 @@ msgb_reset(msg); if (resp) { - sendto(cfg->gw_fd.bfd.fd, resp->l2h, msgb_l2len(resp), 0, (struct sockaddr *) &addr, sizeof(addr)); + sendto(cfg->gw_fd.bfd.fd, resp->l2h, msgb_l2len(resp), 0, &addr.u.sa, sizeof(addr)); msgb_free(resp); } @@ -345,7 +345,7 @@ if (cfg->call_agent_addr) flags |= OSMO_SOCK_F_CONNECT; - rc = osmo_sock_init2_ofd(&cfg->gw_fd.bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, + rc = osmo_sock_init2_ofd(&cfg->gw_fd.bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, cfg->source_addr, cfg->source_port, cfg->call_agent_addr, cfg->call_agent_addr ? 2727 : 0, flags); if (rc < 0) { diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index c5b6d17..620b0d1 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -1262,7 +1263,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, struct msgb *msg); + struct osmo_sockaddr *addr, struct msgb *msg); static void test_packet_error_detection(int patch_ssrc, int patch_ts) { @@ -1274,7 +1275,7 @@ struct mgcp_config cfg = {0}; struct mgcp_rtp_state state; struct mgcp_rtp_end *rtp; - struct sockaddr_in addr = { 0 }; + struct osmo_sockaddr addr = { 0 }; uint32_t last_ssrc = 0; uint32_t last_timestamp = 0; uint32_t last_seqno = 0; @@ -1486,7 +1487,8 @@ OSMO_ASSERT(conn->end.rtp_port == htons(16434)); memset(&addr, 0, sizeof(addr)); inet_aton("8.8.8.8", &addr); - OSMO_ASSERT(conn->end.addr.s_addr == addr.s_addr); + OSMO_ASSERT(conn->end.addr.u.sa.sa_family == AF_INET); + OSMO_ASSERT(conn->end.addr.u.sin.sin_addr.s_addr == addr.s_addr); /* Check what happens without that flag */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:03:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 13:03:57 +0000 Subject: Change in osmo-mgw[master]: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19970 ) Change subject: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command ...................................................................... mgw: Introduce VTY cmd 'rtp bind-ip-v6' command This commit allows for fully IPv6 systems to work fine. However, if a remote endpoint still wants to use IPv4, it will fail since at this point osmo-mgw still doesn't re-bind the local end of the connection to an IPv4 after having initially bound it to an IPv6 one. This kind of scenarios get fixed in next commits. TODO: really bind the socket if a different IP address is requested. Change-Id: I8ed94bd3f674f498e6ba315f44a351fff9c1be15 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 53 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/70/19970/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 75e531b..f3f225e 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -95,7 +95,8 @@ */ struct mgcp_port_range { /* addr or NULL to fall-back to default */ - char *bind_addr; + char *bind_addr_v4; + char *bind_addr_v6; /* dynamically allocated */ int range_start; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 756ae2a..c90991c 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -102,9 +102,11 @@ char ipbuf[INET6_ADDRSTRLEN]; int rc; endp = conn->conn->endp; + bool rem_addr_set = !addr_is_any(&conn->end.addr); + char *bind_addr; /* Try probing the local IP-Address */ - if (endp->cfg->net_ports.bind_addr_probe && !addr_is_any(&conn->end.addr)) { + if (endp->cfg->net_ports.bind_addr_probe && rem_addr_set) { rc = osmo_sock_local_ip(addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); if (rc < 0) LOGPCONN(conn->conn, DRTP, LOGL_ERROR, @@ -118,21 +120,31 @@ } /* Select from preconfigured IP-Addresses. We don't have bind_addr for Osmux (yet?). */ - if (endp->cfg->net_ports.bind_addr) { + if (rem_addr_set) { /* Check there is a bind IP for the RTP traffic configured, * if so, use that IP-Address */ - osmo_strlcpy(addr, endp->cfg->net_ports.bind_addr, INET6_ADDRSTRLEN); + bind_addr = conn->end.addr.u.sa.sa_family == AF_INET6 ? + endp->cfg->net_ports.bind_addr_v6 : + endp->cfg->net_ports.bind_addr_v4; + } else { + /* Choose any of the bind addresses, preferring v6 over v4 */ + bind_addr = endp->cfg->net_ports.bind_addr_v6; + if (!bind_addr) + bind_addr = endp->cfg->net_ports.bind_addr_v4; + } + if (bind_addr) { LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "using configured rtp bind ip as local bind ip %s\n", - addr); + bind_addr); } else { /* No specific bind IP is configured for the RTP traffic, so * assume the IP where we listen for incoming MGCP messages * as bind IP */ - osmo_strlcpy(addr, endp->cfg->source_addr, INET6_ADDRSTRLEN); + bind_addr = endp->cfg->source_addr; LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, - "using mgcp bind ip as local rtp bind ip: %s\n", addr); + "using mgcp bind ip as local rtp bind ip: %s\n", bind_addr); } + osmo_strlcpy(addr, bind_addr, INET6_ADDRSTRLEN); } /* This does not need to be a precision timestamp and diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 8ea1cdd..aa27d41 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -71,9 +71,12 @@ vty_out(vty, " rtp port-range %u %u%s", g_cfg->net_ports.range_start, g_cfg->net_ports.range_end, VTY_NEWLINE); - if (g_cfg->net_ports.bind_addr) + if (g_cfg->net_ports.bind_addr_v4) vty_out(vty, " rtp bind-ip %s%s", - g_cfg->net_ports.bind_addr, VTY_NEWLINE); + g_cfg->net_ports.bind_addr_v4, VTY_NEWLINE); + if (g_cfg->net_ports.bind_addr_v6) + vty_out(vty, " rtp bind-ip-v6 %s%s", + g_cfg->net_ports.bind_addr_v6, VTY_NEWLINE); if (g_cfg->net_ports.bind_addr_probe) vty_out(vty, " rtp ip-probing%s", VTY_NEWLINE); else @@ -500,12 +503,11 @@ DEFUN(cfg_mgcp_rtp_bind_ip, cfg_mgcp_rtp_bind_ip_cmd, - "rtp bind-ip " VTY_IPV46_CMD, + "rtp bind-ip A.B.C.D", RTP_STR "Bind endpoints facing the Network\n" - "IPv4 Address to bind to\n" - "IPv6 Address to bind to\n") + "IPv4 Address to bind to\n") { - osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr, argv[0]); + osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v4, argv[0]); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgcp_rtp_bind_ip, @@ -519,8 +521,8 @@ NO_STR RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") { - talloc_free(g_cfg->net_ports.bind_addr); - g_cfg->net_ports.bind_addr = NULL; + talloc_free(g_cfg->net_ports.bind_addr_v4); + g_cfg->net_ports.bind_addr_v4 = NULL; return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgcp_rtp_no_bind_ip, @@ -529,6 +531,27 @@ NO_STR RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") +DEFUN(cfg_mgcp_rtp_bind_ip_v6, + cfg_mgcp_rtp_bind_ip_v6_cmd, + "rtp bind-ip-v6 " VTY_IPV6_CMD, + RTP_STR "Bind endpoints facing the Network\n" + "IPv6 Address to bind to\n") +{ + osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v6, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_rtp_no_bind_ip_v6, +cfg_mgcp_rtp_no_bind_ip_v6_cmd, +"no rtp bind-ip-v6", +NO_STR RTP_STR "Bind endpoints facing the Network\n" +"Address to bind to\n") +{ + talloc_free(g_cfg->net_ports.bind_addr_v6); + g_cfg->net_ports.bind_addr_v6 = NULL; + return CMD_SUCCESS; +} + DEFUN(cfg_mgcp_rtp_net_bind_ip_probing, cfg_mgcp_rtp_net_bind_ip_probing_cmd, "rtp ip-probing", @@ -1527,8 +1550,10 @@ install_element(MGCP_NODE, &cfg_mgcp_rtp_port_range_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_net_bind_ip_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_bind_ip_cmd); + install_element(MGCP_NODE, &cfg_mgcp_rtp_bind_ip_v6_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_no_net_bind_ip_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_no_bind_ip_cmd); + install_element(MGCP_NODE, &cfg_mgcp_rtp_no_bind_ip_v6_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_net_bind_ip_probing_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_no_net_bind_ip_probing_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_ip_dscp_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8ed94bd3f674f498e6ba315f44a351fff9c1be15 Gerrit-Change-Number: 19970 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:03:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 13:03:58 +0000 Subject: Change in osmo-mgw[master]: mgw: Find and store RTP conn local_addr once during CRCX handling References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19971 ) Change subject: mgw: Find and store RTP conn local_addr once during CRCX handling ...................................................................... mgw: Find and store RTP conn local_addr once during CRCX handling It doesn't make sense to call the function several times since anyway we are only binding during allocate_port()->mgcp_bind_net_rtp_port()->bind_rtp()->mgcp_create_bind()->osmo_sock_init2(). Let's better calculate the local IP addr once and use that stored value. THis is a previous step towards next commit updating the local IP addr and re-bindng if encessary. Change-Id: I803b99c5e5fe0f92a5bf6796d8c25df88d1608e6 --- M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 15 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/71/19971/1 diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index 9674445..7dbf330 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -118,6 +118,9 @@ /* local UDP port number of the RTP socket; RTCP is +1 */ int local_port; + /* where the endpoint RTP connection binds to, set during CRCX and + * possibly updated during MDCX */ + char local_addr[INET6_ADDRSTRLEN]; }; struct mgcp_rtp_tap { diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index c90991c..e7cccde 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1620,7 +1620,6 @@ { char name[512]; struct mgcp_rtp_end *end; - char local_ip_addr[INET6_ADDRSTRLEN]; snprintf(name, sizeof(name), "%s-%s", conn->conn->name, conn->conn->id); end = &conn->end; @@ -1643,9 +1642,7 @@ end->rtcp.data = conn; end->rtcp.cb = rtp_data_net; - mgcp_get_local_addr(local_ip_addr, conn); - - return bind_rtp(endp->cfg, local_ip_addr, end, endp); + return bind_rtp(endp->cfg, conn->end.local_addr, end, endp); } /*! free allocated RTP and RTCP ports. diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 1269524..1e7ccbf 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -223,24 +223,22 @@ const char *trans_id, bool add_conn_params) { - /* TODO: we may want to define another local_ip_osmux var to us for - OSMUX connections. Perhaps adding a new internal API to get it based - on conn type */ - const char *addr = endp->cfg->local_ip; + /* cfg->local_ip allows overwritting the announced IP address with + * regards to the one we actually bind to. Useful in behind-NAT + * scenarios. + * TODO: we may want to define another local_ip_osmux var to + * us for OSMUX connections. Perhaps adding a new internal API to get it + * based on conn type. + */ + const char *addr = endp->cfg->local_ip ? : conn->end.local_addr; struct msgb *sdp; int rc; struct msgb *result; - char local_ip_addr[INET6_ADDRSTRLEN]; sdp = msgb_alloc_headroom(4096, 128, "sdp record"); if (!sdp) return NULL; - if (!addr) { - mgcp_get_local_addr(local_ip_addr, conn); - addr = local_ip_addr; - } - /* Attach optional connection parameters */ if (add_conn_params) { rc = add_params(sdp, endp, conn); @@ -943,6 +941,9 @@ goto error2; } + /* Find a local address for conn based on policy and initial SDP remote + information, then find a free port for it */ + mgcp_get_local_addr(conn->end.local_addr, conn); 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/c/osmo-mgw/+/19971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I803b99c5e5fe0f92a5bf6796d8c25df88d1608e6 Gerrit-Change-Number: 19971 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:03:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 13:03:58 +0000 Subject: Change in osmo-mgw[master]: mgw: Announce and rebind new local address if change required during ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19972 ) Change subject: mgw: Announce and rebind new local address if change required during MDCX ...................................................................... mgw: Announce and rebind new local address if change required during MDCX MDCX may provide a new remote address, which means we may need to update our announced IP addr and re-bind our local end. This can happen for instance if MGW initially provided an IPv4 during CRCX ACK, and now MDCX tells us the remote has an IPv6 address. Change-Id: Iaed424e2c209e1753e1f579752fc684aaad7a512 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/72/19972/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 1e7ccbf..4c00140 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1006,6 +1006,7 @@ { struct mgcp_endpoint *endp = p->endp; struct rate_ctr_group *rate_ctrs = endp->trunk->ratectr.mgcp_mdcx_ctr_group; + char new_local_addr[INET6_ADDRSTRLEN]; int error_code = 500; int silent = 0; int have_sdp = 0; @@ -1170,6 +1171,20 @@ that conn. */ } + /* MDCX may have provided a new remote address, which means we may need + to update our announced IP addr and re-bind our local end. This can + happen for instance if MGW initially provided an IPv4 during CRCX + ACK, and now MDCX tells us the remote has an IPv6 address. */ + mgcp_get_local_addr(new_local_addr, conn); + if (strcmp(new_local_addr, conn->end.local_addr)) { + osmo_strlcpy(conn->end.local_addr, new_local_addr, sizeof(conn->end.local_addr)); + mgcp_free_rtp_port(&conn->end); + if (allocate_port(endp, conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BIND_PORT]); + goto error3; + } + } + if (setup_rtp_processing(endp, conn) != 0) { rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_START_RTP]); goto error3; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iaed424e2c209e1753e1f579752fc684aaad7a512 Gerrit-Change-Number: 19972 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:04:31 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 3 Sep 2020 13:04:31 +0000 Subject: Change in osmo-bsc[master]: CBSP VTY: re-add legacy cbc config for backwards compat In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19967 to look at the new patch set (#2). Change subject: CBSP VTY: re-add legacy cbc config for backwards compat ...................................................................... CBSP VTY: re-add legacy cbc config for backwards compat In commit [1], I replaced the way the CBSP link is configured in the VTY. But that configuration was already part of a release, hence I should only have deprecated the old commands. Re-add the legacy config as deprecated. Try to make the legacy commands take a similar effect as they previously would be intended for, i.e. switching to server/client/disabled modes, and take effect immediately when commands are read from telnet. [1] 641f7f08450f2d0c4b8e8a9f6a36b0a6b2788816 Icaa2775cc20a99227dabe38a775ff808b374cf98 "CBSP: rewrite the CBSP link setup and 'cbc' VTY section" Related: OS#4702 Change-Id: If6b742f28191b3f19ff1d87a217037a305133f4b --- M src/osmo-bsc/cbsp_link.c M tests/cbc.vty 2 files changed, 157 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/19967/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If6b742f28191b3f19ff1d87a217037a305133f4b Gerrit-Change-Number: 19967 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:26:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:26:00 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix mgcp_rtp_end field description comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19968 ) Change subject: mgw: Fix mgcp_rtp_end field description comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ieb044daaaa47572cd9a2524ea69e903200527d17 Gerrit-Change-Number: 19968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:30:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:30:06 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19969 ) Change subject: mgw: Initial IPv6 support ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_network.c File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_network.c at 80 PS1, Line 80: static bool addr_is_any(struct osmo_sockaddr *osa) { : if (osa->u.sa.sa_family == AF_INET6) { : struct in6_addr ip6_any = IN6ADDR_ANY_INIT; : return memcmp(&osa->u.sin6.sin6_addr, : &ip6_any, sizeof(ip6_any)) == 0; : } else { : return osa->u.sin.sin_addr.s_addr == 0; : } : } shouldn't we by now have a generic helper for this in libosmocore? I think I've seen something like this multiple times in past weeks https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_sdp.c File src/libosmo-mgcp/mgcp_sdp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_sdp.c at 266 PS1, Line 266: static int audio_ip_from_sdp(struct osmo_sockaddr *dst_addr, char *sdp) : { : bool is_ipv6; : char ipbuf[INET6_ADDRSTRLEN]; : if (strncmp("c=IN IP", sdp, 7) != 0) : return -1; : sdp += 7; : if (*sdp == '6') : is_ipv6 = true; : else if (*sdp == '4') : is_ipv6 = false; : else : return -1; : sdp++; : if (*sdp != ' ') : return -1; : sdp++; : if (is_ipv6) { : /* 45 = INET6_ADDRSTRLEN -1 */ : if (sscanf(sdp, "%45s", ipbuf) != 1) : return -1; : if (inet_pton(AF_INET6, ipbuf, &dst_addr->u.sin6.sin6_addr) != 1) : return -1; : dst_addr->u.sa.sa_family = AF_INET6; : } else { : /* 15 = INET_ADDRSTRLEN -1 */ : if (sscanf(sdp, "%15s", ipbuf) != 1) : return -1; : if (inet_pton(AF_INET, ipbuf, &dst_addr->u.sin.sin_addr) != 1) : return -1; : dst_addr->u.sa.sa_family = AF_INET; : } : return 0; : } I thoguht something like this was also in libosmo-mgcp-client patches recently? Is there a chance to unify that code? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:30:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:30:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:30:52 +0000 Subject: Change in osmo-mgw[master]: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19970 ) Change subject: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8ed94bd3f674f498e6ba315f44a351fff9c1be15 Gerrit-Change-Number: 19970 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:30:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:31:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:31:40 +0000 Subject: Change in osmo-mgw[master]: mgw: Find and store RTP conn local_addr once during CRCX handling In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19971 ) Change subject: mgw: Find and store RTP conn local_addr once during CRCX handling ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I803b99c5e5fe0f92a5bf6796d8c25df88d1608e6 Gerrit-Change-Number: 19971 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:31:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:32:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:32:11 +0000 Subject: Change in osmo-mgw[master]: mgw: Announce and rebind new local address if change required during ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19972 ) Change subject: mgw: Announce and rebind new local address if change required during MDCX ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iaed424e2c209e1753e1f579752fc684aaad7a512 Gerrit-Change-Number: 19972 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:32:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:33:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:33:00 +0000 Subject: Change in osmo-bsc[master]: CBSP: adjust manual to reflect new 'cbc' VTY config In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19966 ) Change subject: CBSP: adjust manual to reflect new 'cbc' VTY config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I101144dc4ebf151fa23d05743398aeea4a26834b Gerrit-Change-Number: 19966 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:33:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:33:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:33:34 +0000 Subject: Change in osmo-bsc[master]: CBSP VTY: re-add legacy cbc config for backwards compat In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19967 ) Change subject: CBSP VTY: re-add legacy cbc config for backwards compat ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If6b742f28191b3f19ff1d87a217037a305133f4b Gerrit-Change-Number: 19967 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:33:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:33:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:33:39 +0000 Subject: Change in osmo-bsc[master]: CBSP: adjust manual to reflect new 'cbc' VTY config In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19966 ) Change subject: CBSP: adjust manual to reflect new 'cbc' VTY config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I101144dc4ebf151fa23d05743398aeea4a26834b Gerrit-Change-Number: 19966 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 03 Sep 2020 13:33:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:33:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:33:42 +0000 Subject: Change in osmo-bsc[master]: CBSP: adjust manual to reflect new 'cbc' VTY config In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19966 ) Change subject: CBSP: adjust manual to reflect new 'cbc' VTY config ...................................................................... CBSP: adjust manual to reflect new 'cbc' VTY config Related: OS#4702 Change-Id: I101144dc4ebf151fa23d05743398aeea4a26834b --- M doc/manuals/chapters/smscb.adoc 1 file changed, 42 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/smscb.adoc b/doc/manuals/chapters/smscb.adoc index f7469a3..011aec4 100644 --- a/doc/manuals/chapters/smscb.adoc +++ b/doc/manuals/chapters/smscb.adoc @@ -13,7 +13,7 @@ In order to use SMSCB with OsmoBSC, you will need to -* Configure the CBSP server and/or client +* Configure OsmoBSC as either CBSP server or client * Use a channel combination including a CBCH on the BTSs === Enabling a CBCH channel combination @@ -41,41 +41,63 @@ In order to comply with the specifications, OsmoBSC supports this mode of operation as CBSP TCP server. However, to make network operation and configuration more simple, it also can operate in TCP client mode, -connecting to the CBC. This way the all the BSCs need to know is the CBC IP +connecting to the CBC. This way the BSCs need to know the CBC IP address, but not vice-versa. -The BSC can operate both CBSP TCP server and CBSP TCP client mode in -parallel. +The BSC can operate in either CBSP TCP server mode or CBSP TCP client mode. The CBC related configuration of OsmoBSC can be found in the `cbc` configuration node of the VTY interface. -.Example: Configure CBSP TCP client to connect to CBC at 1.2.3.4:48049 +The default port number for the CBSP server is 48049, according to the CBSP +specification. Hence it normally suffices to configure only the IP addresses for +the remote CBC server or the local CBSP server: + +.Example: Configure CBSP TCP client to connect to CBC at 1.2.3.4:48049 in osmo-bsc.cfg ---- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# cbc -OsmoBSC(config-cbc)# remote-ip 1.2.3.4 -OsmoBSC(config-cbc)# remote-port 48049 -OsmoBSC(config-cbc)# end +cbc + mode client + client + remote-ip 1.2.3.4 ---- -.Example: Disable CBSP TCP client +In server mode, the default configuration is 127.0.0.1:48049, so it suffices to +set `mode server` to accept CBSP connections from localhost: + ---- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# cbc -OsmoBSC(config-cbc)# no remote-ip -OsmoBSC(config-cbc)# end +cbc + mode server ---- -.Example: Configure CBSP TCP server to listen for CBC at 127.0.0.2:9999 +To also listen for inbound CBSP connections on all interfaces, both IPv4 and +IPv6: + +.Example: Configure CBSP TCP server to listen on all interfaces in osmo-bsc.cfg +---- +cbc + mode server + server + local-ip :: +---- + +Should non-standard port numbers be required, these can be configured with the +`client` / `local-port` or the `server` / `remote-port` settings. + +The `client` config also supports an explicit local bind for connecting to the +remote CBC, using `client` / `local-ip` and `local-port`. + +IP addresses for client and server can remain configured at the same time, and +the `mode` command can be used to switch between client and server operation. +The `mode` command takes immediate effect, no restart of OsmoBSC is required. +After changing `cbc` IP addresses in the telnet VTY, it is required to switch +`mode` to `disabled` and back to `client` or `server` to take effect. + +.Example: Disable the CBSP link in the telnet VTY ---- OsmoBSC> enable OsmoBSC# configure terminal OsmoBSC(config)# cbc -OsmoBSC(config-cbc)# listen-ip 127.0.0.2 -OsmoBSC(config-cbc)# listen-port 9999 +OsmoBSC(config-cbc)# mode disabled OsmoBSC(config-cbc)# end ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I101144dc4ebf151fa23d05743398aeea4a26834b Gerrit-Change-Number: 19966 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 13:33:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 3 Sep 2020 13:33:42 +0000 Subject: Change in osmo-bsc[master]: CBSP VTY: re-add legacy cbc config for backwards compat In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19967 ) Change subject: CBSP VTY: re-add legacy cbc config for backwards compat ...................................................................... CBSP VTY: re-add legacy cbc config for backwards compat In commit [1], I replaced the way the CBSP link is configured in the VTY. But that configuration was already part of a release, hence I should only have deprecated the old commands. Re-add the legacy config as deprecated. Try to make the legacy commands take a similar effect as they previously would be intended for, i.e. switching to server/client/disabled modes, and take effect immediately when commands are read from telnet. [1] 641f7f08450f2d0c4b8e8a9f6a36b0a6b2788816 Icaa2775cc20a99227dabe38a775ff808b374cf98 "CBSP: rewrite the CBSP link setup and 'cbc' VTY section" Related: OS#4702 Change-Id: If6b742f28191b3f19ff1d87a217037a305133f4b --- M src/osmo-bsc/cbsp_link.c M tests/cbc.vty 2 files changed, 157 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index f4cdbb7..4926799 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -543,6 +543,91 @@ return CMD_SUCCESS; } +/* --- Deprecated 'cbc' commands for backwards compat --- */ + +DEFUN_DEPRECATED(cfg_cbc_remote_ip, cfg_cbc_remote_ip_cmd, + "remote-ip A.B.C.D", + "IP Address of the Cell Broadcast Centre\n" + "IP Address of the Cell Broadcast Centre\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/ mode%s", + VTY_NEWLINE); + osmo_sockaddr_str_from_str(&cbc->client.remote_addr, argv[0], cbc->client.remote_addr.port); + cbc->mode = BSC_CBC_LINK_MODE_CLIENT; + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + return CMD_SUCCESS; +} +DEFUN_DEPRECATED(cfg_cbc_no_remote_ip, cfg_cbc_no_remote_ip_cmd, + "no remote-ip", + NO_STR "Remove IP address of CBC; disables outbound CBSP connections\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/mode%s", + VTY_NEWLINE); + if (cbc->mode == BSC_CBC_LINK_MODE_CLIENT) { + cbc->mode = BSC_CBC_LINK_MODE_DISABLED; + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + } + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_remote_port, cfg_cbc_remote_port_cmd, + "remote-port <1-65535>", + "TCP Port number of the Cell Broadcast Centre (Default: 48049)\n" + "TCP Port number of the Cell Broadcast Centre (Default: 48049)\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/remote-port config is deprecated, instead use cbc/client/remote-port%s", + VTY_NEWLINE); + cbc->client.remote_addr.port = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_listen_port, cfg_cbc_listen_port_cmd, + "listen-port <1-65535>", + "Local TCP port at which BSC listens for incoming CBSP connections from CBC\n" + "Local TCP port at which BSC listens for incoming CBSP connections from CBC\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode%s", + VTY_NEWLINE); + cbc->mode = BSC_CBC_LINK_MODE_SERVER; + cbc->server.local_addr.port = atoi(argv[0]); + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_no_listen_port, cfg_cbc_no_listen_port_cmd, + "no listen-port", + NO_STR "Remove CBSP Listen Port; disables inbound CBSP connections\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode%s", + VTY_NEWLINE); + if (cbc->mode == BSC_CBC_LINK_MODE_SERVER) { + cbc->mode = BSC_CBC_LINK_MODE_DISABLED; + if (vty->type != VTY_FILE) + bsc_cbc_link_restart(); + } + return CMD_SUCCESS; +} + +DEFUN_DEPRECATED(cfg_cbc_listen_ip, cfg_cbc_listen_ip_cmd, + "listen-ip A.B.C.D", + "Local IP Address where BSC listens for incoming CBC connections (Default: 127.0.0.1)\n" + "Local IP Address where BSC listens for incoming CBC connections\n") +{ + struct bsc_cbc_link *cbc = vty_cbc_data(vty); + vty_out(vty, "%% cbc/listen-ip config is deprecated, instead use cbc/server/local-ip%s", + VTY_NEWLINE); + osmo_sockaddr_str_from_str(&cbc->server.local_addr, argv[0], cbc->server.local_addr.port); + return CMD_SUCCESS; +} + void cbc_vty_init(void) { install_element_ve(&show_cbc_cmd); @@ -564,4 +649,12 @@ install_element(CBC_CLIENT_NODE, &cfg_cbc_client_local_port_cmd); install_element(CBC_CLIENT_NODE, &cfg_cbc_client_no_local_ip_cmd); install_element(CBC_CLIENT_NODE, &cfg_cbc_client_no_local_port_cmd); + + /* Deprecated, for backwards compat */ + install_element(CBC_NODE, &cfg_cbc_remote_ip_cmd); + install_element(CBC_NODE, &cfg_cbc_no_remote_ip_cmd); + install_element(CBC_NODE, &cfg_cbc_remote_port_cmd); + install_element(CBC_NODE, &cfg_cbc_listen_port_cmd); + install_element(CBC_NODE, &cfg_cbc_no_listen_port_cmd); + install_element(CBC_NODE, &cfg_cbc_listen_ip_cmd); } diff --git a/tests/cbc.vty b/tests/cbc.vty index 7a4031f..a15de59 100644 --- a/tests/cbc.vty +++ b/tests/cbc.vty @@ -209,3 +209,67 @@ OsmoBSC(config-cbc)# mode disabled OsmoBSC(config-cbc)# do show cbc CBSP link is disabled + + +OsmoBSC(config-cbc)# # TEST DEPRECATED COMMANDS + +OsmoBSC(config-cbc)# remote-ip 1.2.3.4 +% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/ mode +OsmoBSC(config-cbc)# remote-port 1234 +% cbc/remote-port config is deprecated, instead use cbc/client/remote-port +OsmoBSC(config-cbc)# do show cbc +OsmoBSC is configured as CBSP Client to remote CBC at 1.2.3.4:1234 +CBSP Client Connection: Disconnected +OsmoBSC(config-cbc)# show running-config +... +cbc + mode client +... + client + remote-ip 1.2.3.4 + remote-port 1234 +... + +OsmoBSC(config-cbc)# no remote-ip +% cbc/remote-ip config is deprecated, instead use cbc/client/remote-ip and cbc/mode +OsmoBSC(config-cbc)# do show cbc +CBSP link is disabled +OsmoBSC(config-cbc)# show running-config +... +cbc + mode disabled +... + client + remote-ip 1.2.3.4 + remote-port 1234 +... + +OsmoBSC(config-cbc)# listen-ip 127.0.0.2 +% cbc/listen-ip config is deprecated, instead use cbc/server/local-ip +OsmoBSC(config-cbc)# do show cbc +CBSP link is disabled +OsmoBSC(config-cbc)# listen-port 48049 +% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode +OsmoBSC(config-cbc)# do show cbc +OsmoBSC is configured as CBSP Server on 127.0.0.2:48049 +CBSP Server Connection: Disconnected +OsmoBSC(config-cbc)# show running-config +... +cbc + mode server + server + local-ip 127.0.0.2 + client + remote-ip 1.2.3.4 + remote-port 1234 +... + +OsmoBSC(config-cbc)# no listen-port +% cbc/listen-port config is deprecated, instead use cbc/server/local-port and cbc/mode +OsmoBSC(config-cbc)# do show cbc +CBSP link is disabled +OsmoBSC(config-cbc)# show running-config +... +cbc + mode disabled +... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If6b742f28191b3f19ff1d87a217037a305133f4b Gerrit-Change-Number: 19967 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 14:00:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 14:00:07 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19969 ) Change subject: mgw: Initial IPv6 support ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_network.c File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_network.c at 80 PS1, Line 80: static bool addr_is_any(struct osmo_sockaddr *osa) { : if (osa->u.sa.sa_family == AF_INET6) { : struct in6_addr ip6_any = IN6ADDR_ANY_INIT; : return memcmp(&osa->u.sin6.sin6_addr, : &ip6_any, sizeof(ip6_any)) == 0; : } else { : return osa->u.sin.sin_addr.s_addr == 0; : } : } > shouldn't we by now have a generic helper for this in libosmocore? I think I've seen something like [?] In the other place where you saw it it was checked against strings, not against sockaddr, so no use here. https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_sdp.c File src/libosmo-mgcp/mgcp_sdp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19969/1/src/libosmo-mgcp/mgcp_sdp.c at 266 PS1, Line 266: static int audio_ip_from_sdp(struct osmo_sockaddr *dst_addr, char *sdp) : { : bool is_ipv6; : char ipbuf[INET6_ADDRSTRLEN]; : if (strncmp("c=IN IP", sdp, 7) != 0) : return -1; : sdp += 7; : if (*sdp == '6') : is_ipv6 = true; : else if (*sdp == '4') : is_ipv6 = false; : else : return -1; : sdp++; : if (*sdp != ' ') : return -1; : sdp++; : if (is_ipv6) { : /* 45 = INET6_ADDRSTRLEN -1 */ : if (sscanf(sdp, "%45s", ipbuf) != 1) : return -1; : if (inet_pton(AF_INET6, ipbuf, &dst_addr->u.sin6.sin6_addr) != 1) : return -1; : dst_addr->u.sa.sa_family = AF_INET6; : } else { : /* 15 = INET_ADDRSTRLEN -1 */ : if (sscanf(sdp, "%15s", ipbuf) != 1) : return -1; : if (inet_pton(AF_INET, ipbuf, &dst_addr->u.sin.sin_addr) != 1) : return -1; : dst_addr->u.sa.sa_family = AF_INET; : } : return 0; : } > I thoguht something like this was also in libosmo-mgcp-client patches recently? Is there a chance to [?] There's already been discussions about work needed to merge all code in general from here and libosmo-mgcp-client, but that's really a different task than the one at hand, and the current task I'm facing is already messy enough (lots of changes in lots of places), so let's better deferr that for another moment. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 03 Sep 2020 14:00:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 15:42:58 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 3 Sep 2020 15:42:58 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: prioritize emergency calls over regular calls In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 to look at the new patch set (#3). Change subject: abis_rsl: prioritize emergency calls over regular calls ...................................................................... abis_rsl: prioritize emergency calls over regular calls when an emergency call arrives while all TCH are busy, the BSC should pick an arbitrary (preferably the longest lasting) call / lchan and release it in favor of the incoming emergancy call. The release of the existing call is a process that can not be done synchronously while the ChanRQD is handled sonce multiple messages are exchanged between BTS and MSC and multiple FSMs need to do their work. To be able to release one lchan while handling a ChanRQD a queue is implemented in which the incomming channel requests are collected. If an emergency call is established while all channels are busy, an arbitrary lchan is picked and freed. When freeing the lchan is done, the queue is checked again and the emergency call is put on the free lchan (TCH/H or TCH/F). Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Related: OS#4549 --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_fsm.h M include/osmocom/bsc/lchan_select.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 8 files changed, 290 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/19793/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Gerrit-Change-Number: 19793 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 15:45:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 15:45:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MGCP_Templates: Apply MGCP AddressType based on provided address References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 ) Change subject: library/MGCP_Templates: Apply MGCP AddressType based on provided address ...................................................................... library/MGCP_Templates: Apply MGCP AddressType based on provided address Change-Id: I1212abd31f6a4758105675908a1b7cb841caa3dd --- M library/MGCP_Templates.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/19973/1 diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index e03fd8e..79d9670 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -310,13 +310,13 @@ integer rtp_port, SDP_fmt_list fmts, SDP_attribute_list attributes) := { protocol_version := 0, - origin := ts_SDP_origin(local_addr, session_id, session_version), + origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), session_name := "-", information := omit, uri := omit, emails := omit, phone_numbers := omit, - connection := ts_SDP_connection_IP(remote_addr), + connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), bandwidth := omit, times := { ts_SDP_time("0","0") }, timezone_adjustments := omit, @@ -341,6 +341,15 @@ } } + function f_mgcp_addr2addrtype(charstring addr) return charstring { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return "IP6"; + } + } + return "IP4"; + } + /* -1 is wildcard, positive is translated as string */ function f_mgcp_osmux_cid_encode(MgcpOsmuxCID osmux_cid) return charstring { if (osmux_cid == -1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1212abd31f6a4758105675908a1b7cb841caa3dd Gerrit-Change-Number: 19973 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 15:45:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 15:45:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_and_mo_call_ipv6 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 ) Change subject: msc: Introduce test TC_lu_and_mo_call_ipv6 ...................................................................... msc: Introduce test TC_lu_and_mo_call_ipv6 It tests IPv6 Transport Address are passed correctly through BSSAP. Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/19974/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 053a5f6..471996f 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1324,8 +1324,12 @@ return; } - var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass := - tr_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_conn_1.mgw_rtp_ip), ?); + var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass; + if (f_mgcp_addr2addrtype(cpars.mgw_conn_1.mgw_rtp_ip) == "IP6") { + tla_ass := tr_BSSMAP_IE_AoIP_TLA6(f_inet6_addr(cpars.mgw_conn_1.mgw_rtp_ip), ?); + } else { + tla_ass := tr_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_conn_1.mgw_rtp_ip), ?); + } var default mdcx := activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_port)); var boolean got_mncc_setup_compl_ind := false; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2a9b23a..5930fe9 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -767,6 +767,21 @@ vc_conn := f_start_handler(refers(f_tc_lu_and_mo_call), 7); vc_conn.done; } +friend function f_tc_lu_and_mo_call_ipv6(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams); + cpars.mgw_conn_1.mgw_rtp_ip := "::1"; + cpars.mgw_conn_2.mgw_rtp_ip := "::2"; + f_perform_lu(); + f_mo_call(cpars); +} +testcase TC_lu_and_mo_call_ipv6() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_mo_call_ipv6), 7); + vc_conn.done; +} /* Verify T(iar) triggers and releases the channel */ friend function f_lu_and_mo_call_sccp_tiar_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -6242,6 +6257,7 @@ execute( TC_cmserv_imsi_unknown() ); execute( TC_cmserv_tmsi_unknown() ); execute( TC_lu_and_mo_call() ); + execute( TC_lu_and_mo_call_ipv6() ); execute( TC_lu_and_mo_call_sccp_tiar_timeout() ); execute( TC_lu_auth_sai_timeout() ); execute( TC_lu_auth_sai_err() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 19:29:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 3 Sep 2020 19:29:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MGCP_Templates: Apply MGCP AddressType based on provided address In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 ) Change subject: library/MGCP_Templates: Apply MGCP AddressType based on provided address ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1212abd31f6a4758105675908a1b7cb841caa3dd Gerrit-Change-Number: 19973 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 03 Sep 2020 19:29:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 3 20:02:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 3 Sep 2020 20:02:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Fix wrong mgcp conn expected in several places References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 ) Change subject: msc: Fix wrong mgcp conn expected in several places ...................................................................... msc: Fix wrong mgcp conn expected in several places Change-Id: I0bb15881e640fe49552108679894d5df15339fc8 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/19975/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 053a5f6..b24cb8d 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -857,7 +857,7 @@ }, mgw_conn_2 := { resp := 1, - mgw_rtp_ip := "1.1.1.1", + mgw_rtp_ip := "2.2.2.2", mgw_rtp_port := 11000, mgcp_connection_id := '22222'H }, @@ -988,9 +988,9 @@ /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("f_mt_call_complete 8"); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip, hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, + cpars.mgw_conn_1.mgw_rtp_port, { int2str(cpars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, cpars.rtp_sdp_format)), @@ -1003,7 +1003,7 @@ } mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp); } else { - mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp); + mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp); } MGCP.send(mgcp_resp); } @@ -1073,9 +1073,9 @@ /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("f_mt_call_complete 8.iu"); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip, hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, + cpars.mgw_conn_1.mgw_rtp_port, { int2str(cpars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, cpars.rtp_sdp_format)), @@ -1088,7 +1088,7 @@ } mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp); } else { - mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp); + mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp); } MGCP.send(mgcp_resp); } @@ -1423,9 +1423,9 @@ /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("f_mo_call_establish 5: rx MDCX for the RAN side"); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip, hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, + cpars.mgw_conn_1.mgw_rtp_port, { int2str(cpars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, cpars.rtp_sdp_format)), @@ -1439,7 +1439,7 @@ } mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp); } else { - mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp); + mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp); } MGCP.send(mgcp_resp); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0bb15881e640fe49552108679894d5df15339fc8 Gerrit-Change-Number: 19975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 01:33:12 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 4 Sep 2020 01:33:12 +0000 Subject: Change in libosmo-sccp[master]: enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19976 ) Change subject: enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE ...................................................................... enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE Quoting 3GPP TS 23.003 8.2: 1111 1010 BSC (BSSAP-LE); 1111 1011 MSC (BSSAP-LE); 1111 1100 SMLC (BSSAP-LE); Hence the SMLC one should also be named *_BSSAP_LE. I'm certain no other osmocom code is using this SSN yet, but anyway keep a backwards compat shim #define. Change-Id: I3e0c1be0ebbd3883d024174d1e7e9167a8281cfb --- M include/osmocom/sigtran/sccp_sap.h 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/76/19976/1 diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index e012635..817ac45 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -131,11 +131,14 @@ OSMO_SCCP_SSN_PCAP = 249, OSMO_SCCP_SSN_BSC_BSSAP_LE = 250, OSMO_SCCP_SSN_MSC_BSSAP_LE = 251, - OSMO_SCCP_SSN_SMLC_BSSAP = 252, + OSMO_SCCP_SSN_SMLC_BSSAP_LE = 252, OSMO_SCCP_SSN_BSS_OAM = 253, OSMO_SCCP_SSN_BSSAP = 254, }; +/* legacy shim for name change */ +#define OSMO_SCCP_SSN_SMLC_BSSAP OSMO_SCCP_SSN_SMLC_BSSAP_LE + extern const struct value_string osmo_sccp_ssn_names[]; static inline const char *osmo_sccp_ssn_name(enum osmo_sccp_ssn val) { return get_value_string(osmo_sccp_ssn_names, val); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3e0c1be0ebbd3883d024174d1e7e9167a8281cfb Gerrit-Change-Number: 19976 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 4 01:36:43 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 Sep 2020 01:36:43 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f519a38d69ce_12d02af35bf545f0358042@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 115s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 115s] [COMPILING libboard/qmod/source/card_pres.c] [ 116s] [COMPILING libboard/qmod/source/wwan_led.c] [ 116s] [COMPILING libboard/qmod/source/i2c.c] [ 116s] [COMPILING libboard/qmod/source/board_qmod.c] [ 116s] [COMPILING apps/dfu/main.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 116s] Memory region Used Size Region Size %age Used [ 116s] rom: 16588 B 16 KB 101.25% [ 116s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 116s] collect2: error: ld returned 1 exit status [ 116s] % [ 116s] make[2]: *** [Makefile:234: flash] Error 1 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 116s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] dh_auto_build: error: make -j1 returned exit code 2 [ 116s] make: *** [debian/rules:16: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 120s] [ 112.441102] sysrq: Power Off [ 120s] [ 112.447735] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] sheep86 failed "build simtrace2_0.7.0.63.39070.dsc" at Fri Sep 4 01:36:40 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Sep 4 06:06:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 06:06:23 +0000 Subject: Change in osmo-bts[master]: vty: clarify documentation of '[no] gsmtap-sapi' command References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19977 ) Change subject: vty: clarify documentation of '[no] gsmtap-sapi' command ...................................................................... vty: clarify documentation of '[no] gsmtap-sapi' command Change-Id: I2030992da604f27fc8cd6f9695a8095fda801f82 --- M src/common/vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/19977/1 diff --git a/src/common/vty.c b/src/common/vty.c index 3f24d66..49e6edf 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1658,14 +1658,14 @@ "gsmtap-sapi (", "|",")", VTY_DO_LOWER); cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, - "GSMTAP SAPI\n", + "Enable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, "no gsmtap-sapi (", "|",")", VTY_DO_LOWER); cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, - NO_STR "GSMTAP SAPI\n", + NO_STR "Disable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2030992da604f27fc8cd6f9695a8095fda801f82 Gerrit-Change-Number: 19977 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 06:06:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 06:06:24 +0000 Subject: Change in osmo-bts[master]: vty: add 'gsmtap-sapi (enable-all|disable-all)' command References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19978 ) Change subject: vty: add 'gsmtap-sapi (enable-all|disable-all)' command ...................................................................... vty: add 'gsmtap-sapi (enable-all|disable-all)' command It's more convenient to use one command to enable/disable sending of all kinds of UL/DL messages at once, rather than specifying all of them individually. Adjust config_write_bts_single(), so it would not print unknown GSMTAP SAPI entries if gsmtap_sapi_mask is set to UINT32_MAX. Change-Id: Icd7fce860ecdcf8ffa107bdfee7ec94ea9ea6cb2 --- M src/common/vty.c 1 file changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/78/19978/1 diff --git a/src/common/vty.c b/src/common/vty.c index 49e6edf..d5993d6 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -251,9 +251,12 @@ bts->agch_queue.thresh_level, bts->agch_queue.low_level, bts->agch_queue.high_level, VTY_NEWLINE); - for (i = 0; i < 32; i++) { + for (i = 0; i < sizeof(uint32_t) * 8; i++) { if (gsmtap_sapi_mask & ((uint32_t) 1 << i)) { - sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, i)); + sapi_buf = get_value_string_or_null(gsmtap_sapi_names, i); + if (sapi_buf == NULL) + continue; + sapi_buf = osmo_str_tolower(sapi_buf); vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } } @@ -1410,6 +1413,23 @@ "logical channel commands\n" \ "logical channel number\n" +DEFUN(cfg_trx_gsmtap_sapi_all, cfg_trx_gsmtap_sapi_all_cmd, + "gsmtap-sapi (enable-all|disable-all)", + "Enable/disable sending of UL/DL messages over GSMTAP\n" + "Enable all kinds of messages (all SAPI)\n" + "Disable all kinds of messages (all SAPI)\n") +{ + if (argv[0][0] == 'e') { + gsmtap_sapi_mask = UINT32_MAX; + gsmtap_sapi_acch = 1; + } else { + gsmtap_sapi_mask = 0x00; + gsmtap_sapi_acch = 0; + } + + return CMD_SUCCESS; +} + DEFUN(cfg_trx_gsmtap_sapi, cfg_trx_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { @@ -1721,6 +1741,7 @@ install_element(BTS_NODE, &cfg_bts_smscb_tgt_qlen_cmd); install_element(BTS_NODE, &cfg_bts_smscb_qhyst_cmd); + install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_all_cmd); install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_cmd); install_element(BTS_NODE, &cfg_trx_no_gsmtap_sapi_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd7fce860ecdcf8ffa107bdfee7ec94ea9ea6cb2 Gerrit-Change-Number: 19978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:32:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:32:41 +0000 Subject: Change in osmo-bts[master]: vty: add 'gsmtap-sapi (enable-all|disable-all)' command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19978 ) Change subject: vty: add 'gsmtap-sapi (enable-all|disable-all)' command ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd7fce860ecdcf8ffa107bdfee7ec94ea9ea6cb2 Gerrit-Change-Number: 19978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 07:32:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:33:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:33:05 +0000 Subject: Change in osmo-bts[master]: vty: clarify documentation of '[no] gsmtap-sapi' command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19977 ) Change subject: vty: clarify documentation of '[no] gsmtap-sapi' command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2030992da604f27fc8cd6f9695a8095fda801f82 Gerrit-Change-Number: 19977 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 07:33:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:33:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:33:07 +0000 Subject: Change in osmo-bts[master]: vty: clarify documentation of '[no] gsmtap-sapi' command In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19977 ) Change subject: vty: clarify documentation of '[no] gsmtap-sapi' command ...................................................................... vty: clarify documentation of '[no] gsmtap-sapi' command Change-Id: I2030992da604f27fc8cd6f9695a8095fda801f82 --- M src/common/vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index 3f24d66..49e6edf 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1658,14 +1658,14 @@ "gsmtap-sapi (", "|",")", VTY_DO_LOWER); cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, - "GSMTAP SAPI\n", + "Enable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, "no gsmtap-sapi (", "|",")", VTY_DO_LOWER); cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, - NO_STR "GSMTAP SAPI\n", + NO_STR "Disable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2030992da604f27fc8cd6f9695a8095fda801f82 Gerrit-Change-Number: 19977 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:33:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:33:40 +0000 Subject: Change in libosmo-sccp[master]: enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19976 ) Change subject: enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3e0c1be0ebbd3883d024174d1e7e9167a8281cfb Gerrit-Change-Number: 19976 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 07:33:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:33:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:33:43 +0000 Subject: Change in libosmo-sccp[master]: enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19976 ) Change subject: enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE ...................................................................... enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE Quoting 3GPP TS 23.003 8.2: 1111 1010 BSC (BSSAP-LE); 1111 1011 MSC (BSSAP-LE); 1111 1100 SMLC (BSSAP-LE); Hence the SMLC one should also be named *_BSSAP_LE. I'm certain no other osmocom code is using this SSN yet, but anyway keep a backwards compat shim #define. Change-Id: I3e0c1be0ebbd3883d024174d1e7e9167a8281cfb --- M include/osmocom/sigtran/sccp_sap.h 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index e012635..817ac45 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -131,11 +131,14 @@ OSMO_SCCP_SSN_PCAP = 249, OSMO_SCCP_SSN_BSC_BSSAP_LE = 250, OSMO_SCCP_SSN_MSC_BSSAP_LE = 251, - OSMO_SCCP_SSN_SMLC_BSSAP = 252, + OSMO_SCCP_SSN_SMLC_BSSAP_LE = 252, OSMO_SCCP_SSN_BSS_OAM = 253, OSMO_SCCP_SSN_BSSAP = 254, }; +/* legacy shim for name change */ +#define OSMO_SCCP_SSN_SMLC_BSSAP OSMO_SCCP_SSN_SMLC_BSSAP_LE + extern const struct value_string osmo_sccp_ssn_names[]; static inline const char *osmo_sccp_ssn_name(enum osmo_sccp_ssn val) { return get_value_string(osmo_sccp_ssn_names, val); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3e0c1be0ebbd3883d024174d1e7e9167a8281cfb Gerrit-Change-Number: 19976 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:34:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:34:05 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 04 Sep 2020 07:34:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:34:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:34:15 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: make rsl mode-modify working again In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19792 ) Change subject: lchan_fsm: make rsl mode-modify working again ...................................................................... lchan_fsm: make rsl mode-modify working again osmo-nitb supports the modification of an lchan if the lchan is compatible but in the wrong mode. This feature was dropped in the transition to AoIP/bsc-split. However, osmo-bsc still has code to generate and parse the messeages, but the FSMs do not support a mode modify yetm Lets add handling for mode-modify to the lchan_fsm and assignment_fsm in order to support mode modify again Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Related: OS#4549 --- M doc/assignment-fsm.dot M doc/assignment.msc M doc/lchan-fsm.dot M doc/lchan.msc M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/lchan_fsm.c 10 files changed, 252 insertions(+), 47 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/doc/assignment-fsm.dot b/doc/assignment-fsm.dot index 5a3a2b9..c218153 100644 --- a/doc/assignment-fsm.dot +++ b/doc/assignment-fsm.dot @@ -22,6 +22,7 @@ bssap -> gscon [label="GSCON_EV_ASSIGNMENT_START\ndata=struct assignment_request",style=dotted] gscon -> WAIT_LCHAN_ACTIVE [label="assignment_fsm_start()",style=dotted] + gscon -> WAIT_LCHAN_ESTABLISHED [label="assignment_fsm_start()\n(mode modify)",style=dotted] WAIT_LCHAN_ACTIVE -> lchan [label="lchan_activate()\nFOR_ASSIGNMENT",style=dotted] lchan -> WAIT_LCHAN_ACTIVE [label="ASSIGNMENT_EV_\nLCHAN_\nACTIVE,ERROR",style=dotted] lchan -> WAIT_LCHAN_ESTABLISHED [label="ASSIGNMENT_EV_\nLCHAN_\nESTABLISHED,ERROR",style=dotted] diff --git a/doc/assignment.msc b/doc/assignment.msc index 4e690a8..fae088f 100644 --- a/doc/assignment.msc +++ b/doc/assignment.msc @@ -9,6 +9,14 @@ gscon note gscon [label="GSCON_EV_ASSIGNMENT_START\n data=struct assignment_request"]; gscon abox gscon [label="ST_ASSIGNMENT"]; ass <- gscon [label="assignment_fsm_start()"]; + |||; + --- [label="IF current lchan supports requested channel mode (re-use)"]; + lchan <- ass [label="LCHAN_EV_REQUEST_MODE_MODIFY"]; + ass abox ass [label="ASSIGNMENT_ST_\nWAIT_LCHAN_ESTABLISHED"]; + ass rbox ass [label="see below"]; + + |||; + --- [label="ELSE: if current lchan does not support requested channel mode (establish new lchan)"]; ass abox ass [label="ASSIGNMENT_ST_\nWAIT_LCHAN_ACTIVE"]; |||; diff --git a/doc/lchan-fsm.dot b/doc/lchan-fsm.dot index b726b0c..fe35903 100644 --- a/doc/lchan-fsm.dot +++ b/doc/lchan-fsm.dot @@ -38,4 +38,10 @@ rtp -> WAIT_RLL_RTP_ESTABLISH [label="LCHAN_EV_RTP_READY",style=dotted] rtp -> ESTABLISHED [label="LCHAN_EV_RTP_RELEASED",style=dotted] + ESTABLISHED -> WAIT_RR_CHAN_MODE_MODIFY_ACK [label="LCHAN_EV_REQUEST_MODE_MODIFY"] + WAIT_RR_CHAN_MODE_MODIFY_ACK -> WAIT_RSL_CHAN_MODE_MODIFY_ACK [label="LCHAN_EV_RR_CHAN_MODE_MODIFY_ACK"] + WAIT_RSL_CHAN_MODE_MODIFY_ACK -> WAIT_RLL_RTP_ESTABLISH [label="LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK\nwhen adding RTP"] + WAIT_RSL_CHAN_MODE_MODIFY_ACK -> ESTABLISHED [label="LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK\nno change to RTP"] + WAIT_RR_CHAN_MODE_MODIFY_ACK -> BORKEN [label="error/timeout",style=dashed] + WAIT_RSL_CHAN_MODE_MODIFY_ACK -> BORKEN [label="error/timeout",style=dashed] } diff --git a/doc/lchan.msc b/doc/lchan.msc index e2caa48..b0e32d6 100644 --- a/doc/lchan.msc +++ b/doc/lchan.msc @@ -129,6 +129,26 @@ ...; ...; + ms rbox mgwep [label="On Mode Modify (e.g. change a TCH lchan from signalling to voice)"]; + lchan abox lchan [label="LCHAN_ST_\nWAIT_RR_CHAN_\nMODE_MODIFY_ACK"]; + ms <= lchan [label="RR Chan Mode Modif"]; + ...; + ms => lchan [label="RR Chan Mode Modif Ack"]; + lchan abox lchan [label="LCHAN_ST_\nWAIT_RSL_CHAN_\nMODE_MODIFY_ACK"]; + ms <= lchan [label="RSL MT Mode Modify Req"]; + ...; + ms => lchan [label="RSL MT Mode Modify Ack"]; + --- [label="IF adding RTP stream"]; + lchan abox lchan [label="LCHAN_ST_WAIT_\nRLL_RTP_ESTABLISH\nT3101"]; + lchan rbox rtp [label="See above at 'LCHAN_RTP_EV_LCHAN_READY'"]; + --- [label="IF not adding RTP stream"]; + lchan abox lchan [label="LCHAN_ST_\nESTABLISHED"]; + --- [label="END: whether adding voice stream"]; + + ...; + ...; + ...; + ms rbox mgwep [label="When the MS or BTS release the lchan"]; lchan abox lchan [label="LCHAN_ST_\nESTABLISHED"]; ms -> lchan [label="RLL Release Ind for SAPI=0"]; diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 5506a86..a50c70e 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -50,6 +50,8 @@ BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK, BTS_CTR_LCHAN_BORKEN_EV_VTY, BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN, + BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RR_CHAN_MODE_MODIFY_ACK, + BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RSL_CHAN_MODE_MODIFY_ACK, BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, BTS_CTR_TS_BORKEN_FROM_UNUSED, BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT, @@ -136,6 +138,8 @@ [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK] = {"lchan_borken:from_state:wait_activ_ack", "Transitions from lchan WAIT_ACTIV_ACK state to BORKEN state"}, [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK] = {"lchan_borken:from_state:wait_rf_release_ack", "Transitions from lchan WAIT_RF_RELEASE_ACK state to BORKEN state"}, [BTS_CTR_LCHAN_BORKEN_FROM_BORKEN] = {"lchan_borken:from_state:borken", "Transitions from lchan BORKEN state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RR_CHAN_MODE_MODIFY_ACK] = {"lchan_borken:from_state:wait_rr_chan_mode_modify_ack", "Transitions from lchan WAIT_RR_CHAN_MODE_MODIFY_ACK state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = {"lchan_borken:from_state:wait_rsl_chan_mode_modify_ack", "Transitions from lchan RSL_CHAN_MODE_MODIFY_ACK state to BORKEN state"}, [BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN] = {"lchan_borken:from_state:unknown", "Transitions from an unknown lchan state to BORKEN state"}, [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK] = {"lchan_borken:event:chan_activ_ack", "CHAN_ACTIV_ACK received in the lchan BORKEN state"}, [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK] = {"lchan_borken:event:chan_activ_nack", "CHAN_ACTIV_NACK received in the lchan BORKEN state"}, diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index 55ab024..df3ed22 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -18,6 +18,8 @@ LCHAN_ST_WAIT_TS_READY, LCHAN_ST_WAIT_ACTIV_ACK, /*< After RSL Chan Act Ack, lchan is active but RTP not configured. */ LCHAN_ST_WAIT_RLL_RTP_ESTABLISH, + LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK, + LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK, LCHAN_ST_ESTABLISHED, /*< Active and RTP is fully configured. */ LCHAN_ST_WAIT_RLL_RTP_RELEASED, LCHAN_ST_WAIT_BEFORE_RF_RELEASE, @@ -40,10 +42,11 @@ LCHAN_EV_RLL_REL_CONF, LCHAN_EV_RSL_RF_CHAN_REL_ACK, LCHAN_EV_RLL_ERR_IND, - - /* FIXME: not yet implemented: Chan Mode Modify, see assignment_fsm_start(). */ - LCHAN_EV_CHAN_MODE_MODIF_ACK, - LCHAN_EV_CHAN_MODE_MODIF_ERROR, + LCHAN_EV_RR_CHAN_MODE_MODIFY_ACK, + LCHAN_EV_RR_CHAN_MODE_MODIFY_ERROR, + LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK, + LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK, + LCHAN_EV_REQUEST_MODE_MODIFY, }; void lchan_fsm_init(); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index d3f7de2..03d53c5 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1186,10 +1186,12 @@ case RSL_MT_MODE_MODIFY_ACK: LOG_LCHAN(msg->lchan, LOGL_DEBUG, "CHANNEL MODE MODIFY ACK\n"); count_codecs(sign_link->trx->bts, msg->lchan); + osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK, NULL); break; case RSL_MT_MODE_MODIFY_NACK: LOG_LCHAN(msg->lchan, LOGL_DEBUG, "CHANNEL MODE MODIFY NACK\n"); rate_ctr_inc(&sign_link->trx->bts->bts_ctrs->ctr[BTS_CTR_MODE_MODIFY_NACK]); + osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK, NULL); break; case RSL_MT_IPAC_PDCH_ACT_ACK: rc = rsl_rx_ipacc_pdch(msg, "ACT ACK", TS_EV_PDCH_ACT_ACK); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index ca29daa..fde028e 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -379,9 +379,8 @@ return 0; } -/* Check if the conn is already associated with an lchan. If yes, we will check - * if that lchan is compatible with the preferred rate/codec. If the lchan - * turns out to be incompatible we try with the alternate rate/codec. */ +/* Decide if we should re-use an existing lchan. For this we check if the + * current lchan is compatible with one of the requested modes. */ static bool reuse_existing_lchan(struct gsm_subscriber_connection *conn) { struct assignment_request *req = &conn->assignment.req; @@ -395,22 +394,10 @@ for (i = 0; i < req->n_ch_mode_rate; i++) if (lchan_type_compat_with_mode(conn->lchan->type, &req->ch_mode_rate[i])) { conn->lchan->ch_mode_rate = req->ch_mode_rate[i]; - break; + return true; } - if (i == req->n_ch_mode_rate) - return false; - - if (conn->lchan->tch_mode != conn->lchan->ch_mode_rate.chan_mode) { - /* FIXME: send Channel Mode Modify to put the current lchan in the right mode, and kick - * off its RTP stream setup code path. See gsm48_lchan_modify() and - * gsm48_rx_rr_modif_ack(), and see lchan_fsm.h LCHAN_EV_CHAN_MODE_MODIF_* */ - LOG_ASSIGNMENT(conn, LOGL_DEBUG, - "Current lchan would be compatible, but Channel Mode Modify is not implemented\n"); - return false; - } - - return true; + return false; } void assignment_fsm_start(struct gsm_subscriber_connection *conn, struct gsm_bts *bts, @@ -447,22 +434,57 @@ return; /* There may be an already existing lchan, if yes, try to work with - * the existing lchan */ + * the existing lchan. */ if (reuse_existing_lchan(conn)) { + + /* If the requested mode and the current TCH mode matches up, just send the + * assignment complete directly and be done with the assignment procedure. */ + if (conn->lchan->tch_mode == conn->lchan->ch_mode_rate.chan_mode) { + LOG_ASSIGNMENT(conn, LOGL_DEBUG, + "Current lchan mode is compatible with requested chan_mode," + " sending BSSMAP Assignment Complete directly." + " requested chan_mode=%s; current lchan is %s\n", + gsm48_chan_mode_name(conn->lchan->ch_mode_rate.chan_mode), + gsm_lchan_name(conn->lchan)); + + send_assignment_complete(conn); + /* If something went wrong during send_assignment_complete(), + * the fi will be gone from error handling in there. */ + if (conn->assignment.fi) { + assignment_count_result(CTR_ASSIGNMENT_COMPLETED); + osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); + } + return; + } + + /* The requested mode does not match the current TCH mode but the lchan is + * compatible. We will initiate a mode modify procedure. */ LOG_ASSIGNMENT(conn, LOGL_DEBUG, - "Current lchan is compatible with requested chan_mode," - " sending BSSMAP Assignment Complete directly." - " requested chan_mode=%s; current lchan is %s\n", + "Current lchan mode is not compatible with requested chan_mode," + " so we will modify it. requested chan_mode=%s; current lchan is %s\n", gsm48_chan_mode_name(conn->lchan->ch_mode_rate.chan_mode), gsm_lchan_name(conn->lchan)); - send_assignment_complete(conn); - /* If something went wrong during send_assignment_complete(), the fi will be gone from - * error handling in there. */ - if (conn->assignment.fi) { - assignment_count_result(CTR_ASSIGNMENT_COMPLETED); - osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); - } + info = (struct lchan_activate_info){ + .activ_for = FOR_ASSIGNMENT, + .for_conn = conn, + .chan_mode = conn->lchan->ch_mode_rate.chan_mode, + .encr = conn->lchan->encr, + .s15_s0 = conn->lchan->ch_mode_rate.s15_s0, + .requires_voice_stream = conn->assignment.requires_voice_stream, + .msc_assigned_cic = req->msc_assigned_cic, + .re_use_mgw_endpoint_from_lchan = conn->lchan, + }; + + osmo_fsm_inst_dispatch(conn->lchan->fi, LCHAN_EV_REQUEST_MODE_MODIFY, &info); + + /* Since we opted not to allocate a new lchan, the new lchan is still the old lchan. */ + conn->assignment.new_lchan = conn->lchan; + + /* Also we need to skip the RR assignment, so we jump forward and wait for the lchan_fsm until it + * reaches the established state again. */ + assignment_fsm_state_chg(ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED); + return; } @@ -682,6 +704,7 @@ .out_state_mask = 0 | S(ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE) | S(ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE) + | S(ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED) /* MODE MODIFY */ , }, [ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE] = { diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index be114f0..848f623 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -655,7 +655,6 @@ int gsm48_rx_rr_modif_ack(struct msgb *msg) { - int rc; struct gsm48_hdr *gh = msgb_l3(msg); struct gsm48_chan_mode_modify *mod = (struct gsm48_chan_mode_modify *) gh->data; @@ -689,15 +688,7 @@ break; } - /* We've successfully modified the MS side of the channel, - * now go on to modify the BTS side of the channel */ - rc = rsl_chan_mode_modify_req(msg->lchan); - - /* FIXME: we not only need to do this after mode modify, but - * also after channel activation */ - if (is_ipaccess_bts(msg->lchan->ts->trx->bts) && mod->mode != GSM48_CMODE_SIGN) - rsl_tx_ipacc_crcx(msg->lchan); - return rc; + return 0; } int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg) @@ -970,9 +961,9 @@ case GSM48_MT_RR_CHAN_MODE_MODIF_ACK: rc = gsm48_rx_rr_modif_ack(msg); if (rc < 0) - osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_CHAN_MODE_MODIF_ERROR, &rc); + osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_RR_CHAN_MODE_MODIFY_ERROR, &rc); else - osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_CHAN_MODE_MODIF_ACK, msg); + osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_RR_CHAN_MODE_MODIFY_ACK, msg); break; case GSM48_MT_RR_CLSM_CHG: handle_classmark_chg(conn, msg); diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 26bfd29..115c3da 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -59,6 +59,7 @@ switch (lchan->fi->state) { case LCHAN_ST_WAIT_RLL_RTP_ESTABLISH: case LCHAN_ST_ESTABLISHED: + case LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK: return true; default: return false; @@ -249,7 +250,7 @@ } while(0) /* Which state to transition to when lchan_fail() is called in a given state. */ -uint32_t lchan_fsm_on_error[32] = { +uint32_t lchan_fsm_on_error[34] = { [LCHAN_ST_UNUSED] = LCHAN_ST_UNUSED, [LCHAN_ST_WAIT_TS_READY] = LCHAN_ST_UNUSED, [LCHAN_ST_WAIT_ACTIV_ACK] = LCHAN_ST_BORKEN, @@ -260,6 +261,8 @@ [LCHAN_ST_WAIT_RF_RELEASE_ACK] = LCHAN_ST_BORKEN, [LCHAN_ST_WAIT_AFTER_ERROR] = LCHAN_ST_UNUSED, [LCHAN_ST_BORKEN] = LCHAN_ST_BORKEN, + [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_BORKEN, + [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_BORKEN, }; #define lchan_fail(fmt, args...) lchan_fail_to(lchan_fsm_on_error[fi->state], fmt, ## args) @@ -797,6 +800,10 @@ struct gsm_lchan *lchan = lchan_fi_lchan(fi); if (lchan->fi_rtp) osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_LCHAN_READY, 0); + /* Prepare an MGW endpoint CI if appropriate (late). */ + else if (lchan->activate.info.requires_voice_stream) + lchan_rtp_fsm_start(lchan); + } static void lchan_fsm_wait_rll_rtp_establish(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -833,6 +840,66 @@ } } +static void lchan_fsm_wait_rr_chan_mode_modify_ack_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_lchan *lchan = lchan_fi_lchan(fi); + gsm48_lchan_modify(lchan, lchan->activate.info.chan_mode); +} + +static void lchan_fsm_wait_rr_chan_mode_modify_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + + case LCHAN_EV_RR_CHAN_MODE_MODIFY_ACK: + lchan_fsm_state_chg(LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK); + return; + + case LCHAN_EV_RR_CHAN_MODE_MODIFY_ERROR: + lchan_fail("Failed to change channel mode on the MS side: %s in state %s\n", + osmo_fsm_event_name(fi->fsm, event), + osmo_fsm_inst_state_name(fi)); + return; + + default: + OSMO_ASSERT(false); + } +} + +static void lchan_fsm_wait_rsl_chan_mode_modify_ack_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_lchan *lchan = lchan_fi_lchan(fi); + int rc; + + rc = rsl_chan_mode_modify_req(lchan); + if (rc < 0) { + lchan_fail("Failed to send rsl message to change the channel mode on the BTS side: state %s\n", + osmo_fsm_inst_state_name(fi)); + } +} + +static void lchan_fsm_wait_rsl_chan_mode_modify_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_lchan *lchan = lchan_fi_lchan(fi); + switch (event) { + + case LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK: + if (lchan->activate.info.requires_voice_stream) + lchan_fsm_state_chg(LCHAN_ST_WAIT_RLL_RTP_ESTABLISH); + else + lchan_fsm_state_chg(LCHAN_ST_ESTABLISHED); + return; + + case LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK: + lchan_fail("Failed to change channel mode on the BTS side: %s in state %s\n", + osmo_fsm_event_name(fi->fsm, event), + osmo_fsm_inst_state_name(fi)); + return; + + default: + OSMO_ASSERT(false); + } +} + static void lchan_fsm_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); @@ -909,6 +976,8 @@ static void lchan_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct lchan_activate_info *info; + struct osmo_mgcpc_ep_ci *use_mgwep_ci; switch (event) { case LCHAN_EV_RLL_ESTABLISH_IND: @@ -935,6 +1004,48 @@ osmo_fsm_inst_state_name(fi)); return; + case LCHAN_EV_REQUEST_MODE_MODIFY: + + /* FIXME: Add missing implementation to handle an already existing RTP voice stream on MODE MODIFY. + * there may be transitions from VOICE to SIGNALLING and also from VOICE to VOICE with a different + * codec. */ + if (lchan->fi_rtp) { + lchan_fail("MODE MODIFY not implemented when RTP voice stream is already active (VOICE => SIGNALLING, VOICE/CODEC_A => VOICE/CODEC_B)\n"); + return; + } + + info = data; + lchan->activate.info = *info; + use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); + + if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { + if (lchan_mr_config(lchan, info->s15_s0) < 0) { + lchan_fail("Can not generate multirate configuration IE\n"); + return; + } + } + + LOG_LCHAN(lchan, LOGL_INFO, + "Modification requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s encr-alg=A5/%u ck=%s\n", + lchan_activate_mode_name(lchan->activate.info.activ_for), + lchan->activate.info.requires_voice_stream ? "yes" : "no", + lchan->activate.info.requires_voice_stream ? + (use_mgwep_ci ? osmo_mgcpc_ep_ci_name(use_mgwep_ci) : "new") + : "none", + gsm_lchant_name(lchan->type), + gsm48_chan_mode_name(lchan->tch_mode), + (lchan->activate.info.encr.alg_id ? : 1) - 1, + lchan->activate.info.encr.key_len ? osmo_hexdump_nospc(lchan->activate.info.encr.key, + lchan->activate.info.encr.key_len) : "none"); + + /* While the mode is changed the lchan is virtually "not activated", at least + * from the FSM implementations perspective */ + lchan->activate.concluded = false; + + /* Initiate mode modification, start with the MS side (RR) */ + lchan_fsm_state_chg(LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK); + return; + default: OSMO_ASSERT(false); } @@ -1090,6 +1201,12 @@ case LCHAN_ST_BORKEN: ctr = BTS_CTR_LCHAN_BORKEN_FROM_BORKEN; break; + case LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK: + ctr = BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RR_CHAN_MODE_MODIFY_ACK; + break; + case LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK: + ctr = BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RSL_CHAN_MODE_MODIFY_ACK; + break; default: ctr = BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN; } @@ -1223,6 +1340,32 @@ | S(LCHAN_ST_WAIT_RLL_RTP_RELEASED) , }, + [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { + .name = "WAIT_CHAN_RR_MODE_MODIFY_ACK", + .onenter = lchan_fsm_wait_rr_chan_mode_modify_ack_onenter, + .action = lchan_fsm_wait_rr_chan_mode_modify_ack, + .in_event_mask = 0 + | S(LCHAN_EV_RR_CHAN_MODE_MODIFY_ACK) + | S(LCHAN_EV_RR_CHAN_MODE_MODIFY_ERROR) + , + .out_state_mask = 0 + | S(LCHAN_ST_BORKEN) + | S(LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK) + , + }, + [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = { + .name = "WAIT_RSL_CHAN_MODE_MODIFY_ACK", + .onenter = lchan_fsm_wait_rsl_chan_mode_modify_ack_onenter, + .action = lchan_fsm_wait_rsl_chan_mode_modify_ack, + .in_event_mask = 0 + | S(LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK) + | S(LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK) + , + .out_state_mask = 0 + | S(LCHAN_ST_BORKEN) + | S(LCHAN_ST_WAIT_RLL_RTP_ESTABLISH) + , + }, [LCHAN_ST_ESTABLISHED] = { .name = "ESTABLISHED", .onenter = lchan_fsm_established_onenter, @@ -1233,12 +1376,14 @@ | S(LCHAN_EV_RLL_ESTABLISH_IND) /* ignored */ | S(LCHAN_EV_RTP_ERROR) | S(LCHAN_EV_RTP_RELEASED) + | S(LCHAN_EV_REQUEST_MODE_MODIFY) , .out_state_mask = 0 | S(LCHAN_ST_UNUSED) | S(LCHAN_ST_WAIT_RLL_RTP_RELEASED) | S(LCHAN_ST_WAIT_BEFORE_RF_RELEASE) | S(LCHAN_ST_WAIT_RF_RELEASE_ACK) + | S(LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK) , }, [LCHAN_ST_WAIT_RLL_RTP_RELEASED] = { @@ -1324,8 +1469,10 @@ OSMO_VALUE_STRING(LCHAN_EV_RLL_REL_CONF), OSMO_VALUE_STRING(LCHAN_EV_RSL_RF_CHAN_REL_ACK), OSMO_VALUE_STRING(LCHAN_EV_RLL_ERR_IND), - OSMO_VALUE_STRING(LCHAN_EV_CHAN_MODE_MODIF_ACK), - OSMO_VALUE_STRING(LCHAN_EV_CHAN_MODE_MODIF_ERROR), + OSMO_VALUE_STRING(LCHAN_EV_RR_CHAN_MODE_MODIFY_ACK), + OSMO_VALUE_STRING(LCHAN_EV_RR_CHAN_MODE_MODIFY_ERROR), + OSMO_VALUE_STRING(LCHAN_EV_RSL_CHAN_MODE_MODIFY_ACK), + OSMO_VALUE_STRING(LCHAN_EV_RSL_CHAN_MODE_MODIFY_NACK), {} }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c5a283b1ee33745cc1fcfcc09a0f9382224e2eb Gerrit-Change-Number: 19792 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:35:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:35:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Fix wrong mgcp conn expected in several places In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 ) Change subject: msc: Fix wrong mgcp conn expected in several places ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0bb15881e640fe49552108679894d5df15339fc8 Gerrit-Change-Number: 19975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 07:35:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:35:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:35:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MGCP_Templates: Apply MGCP AddressType based on provided address In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 ) Change subject: library/MGCP_Templates: Apply MGCP AddressType based on provided address ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1212abd31f6a4758105675908a1b7cb841caa3dd Gerrit-Change-Number: 19973 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 07:35:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:36:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:36:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_and_mo_call_ipv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 ) Change subject: msc: Introduce test TC_lu_and_mo_call_ipv6 ...................................................................... Patch Set 1: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974/1/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974/1/msc/BSC_ConnectionHandler.ttcn at 1328 PS1, Line 1328: if (f_mgcp_addr2addrtype(cpars.mgw_conn_1.mgw_rtp_ip) == "IP6") { : tla_ass := tr_BSSMAP_IE_AoIP_TLA6(f_inet6_addr(cpars.mgw_conn_1.mgw_rtp_ip), ?); : } else { : tla_ass := tr_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_conn_1.mgw_rtp_ip), ?); : } one could hide all of this in a function that returns the "template BSSMAP_IE_AoIP_TransportLayerAddress" and does the conditional / check internally. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 07:36:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:38:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:38:06 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... Patch Set 20: Code-Review+1 looks good to me. pespin? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Fri, 04 Sep 2020 07:38:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:38:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:38:19 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 04 Sep 2020 07:38:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:38:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:38:51 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 04 Sep 2020 07:38:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 07:49:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 07:49:03 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 22: (5 comments) https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 25 PS22, Line 25: enum gprs_ns2_signal_ns { : S_NSVC_RESET, /* when a NSVC is in reset */ : S_NSVC_BLOCK, /* when a NSVC become blocked */ : S_NSVC_UNBLOCK, /* when a NSVC become unblocked */ : S_NSVC_ALIVE_EXP, /* Tns-alive expired more than N times */ : S_NSVC_REPLACED, /* nsvc object is replaced (sets old_nsvc) */ : S_NSVC_MISMATCH, /* got an unexpected IE (sets msg, pdu_type, ie_type) */ : S_NSVC_DELETED, /* when a NSVC gets deleted */ : S_SNS_CONFIGURED, /* IP-SNS configuration completed */ : S_NSE_AVAILABLE, /* NSE is available */ : S_NSE_UNAVAILABLE, /* NSE is unavailable */ : }; : : struct gprs_ns2_signal_data { : struct gprs_ns2_nse *nse; : uint16_t nsei; : struct gprs_ns2_vc *nsvc; : struct gprs_ns2_vc *old_nsvc; : uint8_t cause; : uint8_t pdu_type; : uint8_t ie_type; : struct msgb *msg; : }; : : enum gprs_ns2_vc_mode { : NS2_VC_MODE_ALIVE, /* The VC will use RESET/BLOCK/UNBLOCK to start the connection and do ALIVE/ACK */ : NS2_VC_MODE_BLOCKRESET, /* The will only use ALIVE/ACK no initiation */ : }; : : /*! Osmoco NS events */ : enum gprs_ns2_evt { : GPRS_NS_EVT_UNIT_DATA, : }; : : /* callbacks for messages transfer */ : /*! Osmocom GPRS callback function type */ : typedef int gprs_ns2_cb_t(enum gprs_ns2_evt event, struct msgb *msg, : uint16_t nsei, uint16_t bvci); I know this patch has been very long in the pipeline already. I would think if we modernize the NS implementation, we should switch from those old signals to moving towards primitives. Look at the SCCP USER SAP or the LAPDm code. Section 5 of TS 48.016 describes the abstract primitives, we would "just" have to give thme a concrete encoding. Plus add some for the various notifications we do with signals now. Not a strict requirement, but an idea at least. https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 65 PS22, Line 65: gprs_ns2_cb_t this would then be a call-back that receives msgb-wrapped osmo_prim from NS to the NS-user https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 71 PS22, Line 71: int gprs_ns2_send(struct gprs_ns2_inst *inst,struct msgb *msg); : int gprs_ns2_send_nse(struct gprs_ns2_nse *nse, struct msgb *msg); : int gprs_ns2_send_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei, struct msgb *msg); : int gprs_ns2_recv_vc(struct gprs_ns2_inst *nsi, : struct gprs_ns2_vc *nsvc, : struct msgb *msg); and those would basically be convenience wrapper functions which generate a msgb-wrapped osmo_prim sent down from the user into the NS https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 86 PS22, Line 86: int gprs_ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause); : int gprs_ns2_tx_block_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause); : int gprs_ns2_tx_reset_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_unblock(struct gprs_ns2_vc *nsvc); : int gprs_ns2_tx_unblock_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_alive(struct gprs_ns2_vc *nsvc); : int gprs_ns2_tx_alive_ack(struct gprs_ns2_vc *nsvc); I think those low-level functions may not actually need to be exposed. User applications should trigger procedurs (like start an UNBLOCK procedure), but a proper NS implementation then should by itself take care of whateve else ise required (like waiting for the ACK, re-transmitting [if specified], have a timer, notify the user of failure/success) https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 104 PS22, Line 104: nt gprs_ns2_tx_sns_ack(struct gprs_ns2_vc *nsvc, uint8_t trans_id, uint8_t *cause, : const struct gprs_ns_ie_ip4_elem *ip4_elems, : unsigned int num_ip4_elems, : const struct gprs_ns_ie_ip6_elem *ip6_elems, : unsigned int num_ip6_elems); : int gprs_ns2_tx_sns_config(struct gprs_ns2_vc *nsvc, bool end_flag, : const struct gprs_ns_ie_ip4_elem *ip4_elems, : unsigned int num_ip4_elems, : const struct gprs_ns_ie_ip6_elem *ip6_elems, : unsigned int num_ip6_elems); : int gprs_ns2_tx_sns_config_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); : int gprs_ns2_tx_sns_size(struct gprs_ns2_vc *nsvc, bool reset_flag, uint16_t max_nr_nsvc, : int ip4_ep_nr, int ip6_ep_nr); : int gprs_ns2_tx_sns_size_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); likewise all of those above. Those should be internal low-level functions inside the NS stack. The stack should (depending on its configuration) handle inbound SNS or trigger outbound SNS. The user should provide configuration and get notifications about successfull/failed SNS procedures. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 22 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 04 Sep 2020 07:49:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 10:53:54 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 Sep 2020 10:53:54 +0000 Subject: Change in libosmo-sccp[master]: Fix default ASP local addr if remote addr contains only IPv4 In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 ) Change subject: Fix default ASP local addr if remote addr contains only IPv4 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 Gerrit-Change-Number: 19932 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 04 Sep 2020 10:53:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 10:55:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 10:55:12 +0000 Subject: Change in libosmo-sccp[master]: Fix default ASP local addr if remote addr contains only IPv4 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 ) Change subject: Fix default ASP local addr if remote addr contains only IPv4 ...................................................................... Fix default ASP local addr if remote addr contains only IPv4 Otherwise it would end up attempting to connect "::" -> "1.2.3.4" which would fail during osmo_sock_init2_multiaddr(). If local address is unset (default), but only IPv4 addresses are set on the remote, then one must use "0.0.0.0" instead. Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 --- M src/osmo_ss7_vty.c 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 109b94a..08e650e 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -29,6 +29,8 @@ #include #include +#include + #include #include #include @@ -1842,8 +1844,18 @@ asp = vty->index; /* If no local addr was set */ if (!asp->cfg.local.host_cnt) { - /* "::" Covers both IPv4 and IPv6 */ - if (ipv6_sctp_supported("::", true)) + bool rem_has_v4 = false, rem_has_v6 = false; + int i; + for (i = 0; i < asp->cfg.remote.host_cnt; i++) { + if (osmo_ip_str_type(asp->cfg.remote.host[i]) == AF_INET6) + rem_has_v6 = true; + else + rem_has_v4 = true; + } + /* "::" Covers both IPv4 and IPv6, but if only IPv4 + * address are set on the remote side, IPv4 on the local + * side must be set too */ + if (ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6)) osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); else osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 Gerrit-Change-Number: 19932 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:27:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:27:57 +0000 Subject: Change in osmo-bts[master]: vty: add 'gsmtap-sapi (enable-all|disable-all)' command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19978 ) Change subject: vty: add 'gsmtap-sapi (enable-all|disable-all)' command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd7fce860ecdcf8ffa107bdfee7ec94ea9ea6cb2 Gerrit-Change-Number: 19978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 04 Sep 2020 11:27:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:29:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:29:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce tests TC_lu_and_{mo, mt}_call_ipv6 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 to look at the new patch set (#2). Change subject: msc: Introduce tests TC_lu_and_{mo,mt}_call_ipv6 ...................................................................... msc: Introduce tests TC_lu_and_{mo,mt}_call_ipv6 It tests IPv6 Transport Address are passed correctly through BSSAP. Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 39 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/19974/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:29:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:29:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Add template helpers for AoIP Transport Layer Address References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 ) Change subject: library: Add template helpers for AoIP Transport Layer Address ...................................................................... library: Add template helpers for AoIP Transport Layer Address This way one can simply pass an IP addr in string format and return the IE no matter the IP version. Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 --- M library/BSSMAP_Templates.ttcn M library/Misc_Helpers.ttcn 2 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/19979/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 694e3e8..0ec5639 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -14,6 +14,8 @@ import from General_Types all; import from Osmocom_Types all; +import from Native_Functions all; +import from Misc_Helpers all; import from GSM_Types all; import from BSSAP_Types all; @@ -436,6 +438,17 @@ template (value) BSSMAP_IE_AoIP_TransportLayerAddress ts_BSSMAP_IE_AoIP_TLA6(OCT16 ip, uint16_t pt) := ts_BSSMAP_IE_AoIP_TLA({ipv6:=ip}, pt, 18); +function f_ts_BSSMAP_IE_AoIP_TLA(charstring addr, uint16_t udp_port) + return template (value) BSSMAP_IE_AoIP_TransportLayerAddress { + if (f_addr_is_ipv6(addr)) { + var OCT16 ip6 := f_inet6_addr(addr); + return ts_BSSMAP_IE_AoIP_TLA6(ip6, udp_port); + } else { + var OCT4 ip := f_inet_addr(addr); + return ts_BSSMAP_IE_AoIP_TLA4(ip, udp_port); + } +} + template BSSMAP_IE_AoIP_TransportLayerAddress tr_BSSMAP_IE_AoIP_TLA(template BSSMAP_FIELD_IPAddress addr, template uint16_t udp_port, template integer len := ?) := { @@ -449,6 +462,17 @@ template BSSMAP_IE_AoIP_TransportLayerAddress tr_BSSMAP_IE_AoIP_TLA6(template OCT16 ip, template uint16_t pt) := tr_BSSMAP_IE_AoIP_TLA({ipv6:=ip}, pt, 18); +function f_tr_BSSMAP_IE_AoIP_TLA(charstring addr, template uint16_t udp_port) + return template BSSMAP_IE_AoIP_TransportLayerAddress { + if (f_addr_is_ipv6(addr)) { + var OCT16 ip6 := f_inet6_addr(addr); + return tr_BSSMAP_IE_AoIP_TLA6(ip6, udp_port); + } else { + var OCT4 ip := f_inet_addr(addr); + return tr_BSSMAP_IE_AoIP_TLA4(ip, udp_port); + } +} + template (value) BSSMAP_IE_KC128 ts_BSSMAP_IE_Kc128(OCT16 kc128) := { elementIdentifier := '83'O, kC128_Value := kc128 diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index 1ca6491..a402525 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -25,4 +25,13 @@ mtc.stop } +function f_addr_is_ipv6(charstring addr) return boolean { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return true; + } + } + return false; +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 Gerrit-Change-Number: 19979 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:34:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:34:24 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... Patch Set 20: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19143/20/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19143/20/src/socket.c at 1019 PS20, Line 1019: return osmo_fd_init_ofd(ofd, osmo_sock_init_osa(type, proto, local, remote, flags)); I think I already commented on this: First check for return of osmo_sock_init_osa(), and if it fails return early, don't pass it to osmo_fd_init_ofd. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Fri, 04 Sep 2020 11:34:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:36:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:36:35 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 04 Sep 2020 11:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:38:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:38:33 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... Patch Set 19: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19416/19/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19416/19/src/socket.c at 1684 PS19, Line 1684: if (rc < 0) Simply return rc; here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 04 Sep 2020 11:38:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:44:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:44:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Add template helpers for AoIP Transport Layer Address In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 to look at the new patch set (#2). Change subject: library: Add template helpers for AoIP Transport Layer Address ...................................................................... library: Add template helpers for AoIP Transport Layer Address This way one can simply pass an IP addr in string format and return the IE no matter the IP version. Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 --- M bsc-nat/gen_links.sh M library/BSSMAP_Templates.ttcn M library/Misc_Helpers.ttcn 3 files changed, 34 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/19979/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 Gerrit-Change-Number: 19979 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 11:46:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 11:46:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Add template helpers for AoIP Transport Layer Address In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 to look at the new patch set (#3). Change subject: library: Add template helpers for AoIP Transport Layer Address ...................................................................... library: Add template helpers for AoIP Transport Layer Address This way one can simply pass an IP addr in string format and return the IE no matter the IP version. Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 --- M bsc-nat/gen_links.sh M library/BSSMAP_Templates.ttcn M library/Misc_Helpers.ttcn M selftest/gen_links.sh 4 files changed, 35 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/19979/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 Gerrit-Change-Number: 19979 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 12:47:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 12:47:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 ) Change subject: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 ...................................................................... bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 61 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/19980/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fb9fa68..f399f03 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1397,12 +1397,12 @@ } /* generate an assignment request for either AoIP or SCCPlite */ -function f_gen_ass_req(boolean osmux_enabled := false, integer bssap_idx := 0) return PDU_BSSAP { +function f_gen_ass_req(boolean osmux_enabled := false, integer bssap_idx := 0, charstring aoip_tla := "1.2.3.4") return PDU_BSSAP { var PDU_BSSAP ass_cmd; var BSSMAP_IE_Osmo_OsmuxCID osmux_cid := valueof(ts_OsmuxCID(0)); if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { var BSSMAP_IE_AoIP_TransportLayerAddress tla := - valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + valueof(f_ts_BSSMAP_IE_AoIP_TLA(aoip_tla, 2342)); if (osmux_enabled) { ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla, osmux_cid)); } else { @@ -1415,11 +1415,11 @@ return ass_cmd; } -function f_gen_handover_req(integer bssap_idx := 0) return PDU_BSSAP { +function f_gen_handover_req(integer bssap_idx := 0, charstring aoip_tla := "1.2.3.4") return PDU_BSSAP { var PDU_BSSAP ho_req; if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { var BSSMAP_IE_AoIP_TransportLayerAddress tla := - valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + valueof(f_ts_BSSMAP_IE_AoIP_TLA(aoip_tla, 2342)); ho_req := valueof(ts_BSSMAP_HandoverRequest(omit, tla)); } else { var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1)); @@ -3093,6 +3093,25 @@ vc_conn.done; } +/* establish initial channel, enable ciphering followed by assignment to ciphered channel */ +private function f_tc_assignment_aoip_tla_v6(charstring id) runs on MSC_ConnHdlr { + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(aoip_tla := "::3"); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + + f_establish_fully(ass_cmd, exp_compl); +} +testcase TC_assignment_aoip_tla_v6() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_aoip_tla_v6), pars); + vc_conn.done; +} + /* establish initial channel, enable ciphering followed by assignment to ciphered channel */ private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { @@ -4628,7 +4647,7 @@ activate(as_Media()); BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, - f_gen_handover_req())); + f_gen_handover_req(aoip_tla := g_pars.host_aoip_tla))); BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -4675,9 +4694,8 @@ BSSAP.receive(tr_BSSMAP_HandoverComplete); setverdict(pass); } -testcase TC_ho_into_this_bsc() runs on test_CT { +function f_tc_ho_into_this_bsc_main(TestHdlrParams pars) runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := f_gen_test_hdlr_pars(); f_init(1, true); f_sleep(1.0); @@ -4697,6 +4715,17 @@ f_ctrs_bsc_and_bts_verify(); } +testcase TC_ho_into_this_bsc() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + f_tc_ho_into_this_bsc_main(pars); +} + +testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + pars.host_aoip_tla := "::6"; + f_tc_ho_into_this_bsc_main(pars); +} + private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr { var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); f_rslem_register(0, new_chan_nr); @@ -7293,6 +7322,9 @@ execute( TC_assignment_csd() ); execute( TC_assignment_ctm() ); execute( TC_assignment_sign() ); + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { + execute( TC_assignment_aoip_tla_v6() ); + } execute( TC_assignment_fr_a5_0() ); execute( TC_assignment_fr_a5_1() ); if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { @@ -7401,6 +7433,7 @@ execute( TC_ho_out_fail_no_result_after_ho_cmd() ); execute( TC_ho_into_this_bsc() ); + execute( TC_ho_into_this_bsc_tla_v6() ); execute( TC_ho_in_fail_msc_clears() ); execute( TC_ho_in_fail_msc_clears_after_ho_detect() ); execute( TC_ho_in_fail_no_detect() ); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index bf96eff..76a56fc 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -279,6 +279,7 @@ var MgcpOsmuxCID osmux_cid; var SDP_Message sdp; var integer cid := f_get_free_mgcp_conn(); + var charstring local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */ if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) { if (cid != 0) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX"); @@ -292,9 +293,14 @@ sdp := mgcp_cmd.sdp; 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; + if (sdp.connection.addr_type == "IP6") { + local_rtp_addr := host_mgw_rtp_v6; + } else { + local_rtp_addr := host_mgw_rtp_v4; + } } var MgcpConnState mgcp_conn := g_media.mgcp_conn[cid]; - sdp := valueof(ts_SDP(mgcp_conn.mgw.host, mgcp_conn.mgw.host, "foo", "21", + sdp := valueof(ts_SDP(mgcp_conn.mgw.host, local_rtp_addr, "foo", "21", mgcp_conn.mgw.port_nr, { int2str(mgcp_conn.rtp_pt) }, {valueof(ts_SDP_rtpmap(mgcp_conn.rtp_pt, mgcp_conn.mime_type & "/" & @@ -316,15 +322,21 @@ runs on MSC_ConnHdlr return template MgcpResponse { var SDP_Message sdp; var integer cid := f_get_mgcp_conn(f_MgcpCmd_extract_conn_id(mgcp_cmd)); + var charstring local_rtp_addr; if (isvalue(mgcp_cmd.sdp)) { sdp := mgcp_cmd.sdp; 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; + if (sdp.connection.addr_type == "IP6") { + local_rtp_addr := host_mgw_rtp_v6; + } else { + local_rtp_addr := host_mgw_rtp_v4; + } } else { 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", + sdp := valueof(ts_SDP(mgcp_conn.peer.host, local_rtp_addr, "foo", "21", mgcp_conn.peer.port_nr, { int2str(mgcp_conn.rtp_pt) }, {valueof(ts_SDP_rtpmap(mgcp_conn.rtp_pt, mgcp_conn.mime_type & "/" & @@ -427,7 +439,9 @@ var TestHdlrParams g_pars; var charstring host_bts := "127.0.0.2"; - var charstring host_mgw := "127.0.0.3"; + var charstring host_mgw_mgcp := "127.0.0.3"; + var charstring host_mgw_rtp_v4 := "127.0.0.5"; + var charstring host_mgw_rtp_v6 := "::1"; var charstring host_msc := "127.0.0.4"; var boolean g_vty_initialized := false; @@ -538,6 +552,7 @@ boolean exp_ms_power_params, boolean aoip, boolean use_osmux, + charstring host_aoip_tla, TestHdlrParamsMSCPool mscpool }; @@ -567,6 +582,7 @@ exp_ms_power_params := false, aoip := true, use_osmux := false, + host_aoip_tla := "1.2.3.4", mscpool := { bssap_idx := 0, rsl_idx := 0, @@ -1015,7 +1031,7 @@ codecType := FR_AMR; } - f_MscConnHdlr_init(g_pars.media_nr, host_bts, host_mgw, codecType); + f_MscConnHdlr_init(g_pars.media_nr, host_bts, host_mgw_mgcp, codecType); /* patch in the LCLS related items, as needed */ f_ass_patch_lcls(ass_tpl, exp_ass_cpl); @@ -1184,7 +1200,7 @@ cmd := ts_CRCX(get_next_trans_id(), ep, "sendrecv", call_id); resp := tr_CRCX_ACK; } - cmd.sdp := ts_SDP(host_msc, host_mgw, "23", "42", + cmd.sdp := ts_SDP(host_msc, host_mgw_rtp_v4, "23", "42", 14000, { int2str(g_media.mgcp_conn[1].rtp_pt) }, { valueof(ts_SDP_ptime(20)) }); mgcp_transceive_mgw(cmd, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 Gerrit-Change-Number: 19980 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 13:14:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 13:14:06 +0000 Subject: Change in osmo-e1-hardware[master]: Change name of repository in README References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 ) Change subject: Change name of repository in README ...................................................................... Change name of repository in README Change-Id: I8a4cfb55386ea7eb1dbf90587a2ceb7995dc363f --- M README 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/81/19981/1 diff --git a/README b/README index 2243462..d3df68e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -osmo-e1-xcvr -- (C) 2011 by Harald Welte +osmo-e1-hradware - Collection of various E1/TDM hardware projects ====================================================================== This repository hosts three different sub-projects: -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8a4cfb55386ea7eb1dbf90587a2ceb7995dc363f Gerrit-Change-Number: 19981 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 13:14:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 13:14:43 +0000 Subject: Change in osmo-e1-hardware[master]: Change name of repository in README In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 ) Change subject: Change name of repository in README ...................................................................... Change name of repository in README Change-Id: I8a4cfb55386ea7eb1dbf90587a2ceb7995dc363f --- M README 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/81/19981/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8a4cfb55386ea7eb1dbf90587a2ceb7995dc363f Gerrit-Change-Number: 19981 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 13:14:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 13:14:52 +0000 Subject: Change in osmo-e1-hardware[master]: Change name of repository in README In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 ) Change subject: Change name of repository in README ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8a4cfb55386ea7eb1dbf90587a2ceb7995dc363f Gerrit-Change-Number: 19981 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 13:14:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 13:14:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 13:14:55 +0000 Subject: Change in osmo-e1-hardware[master]: Change name of repository in README In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 ) Change subject: Change name of repository in README ...................................................................... Change name of repository in README Change-Id: I8a4cfb55386ea7eb1dbf90587a2ceb7995dc363f --- M README 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/README b/README index 2243462..2766310 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -osmo-e1-xcvr -- (C) 2011 by Harald Welte +osmo-e1-hardware - Collection of various E1/TDM hardware projects ====================================================================== This repository hosts three different sub-projects: -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/19981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8a4cfb55386ea7eb1dbf90587a2ceb7995dc363f Gerrit-Change-Number: 19981 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 13:16:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 13:16:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Add template helpers for AoIP Transport Layer Address In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 ) Change subject: library: Add template helpers for AoIP Transport Layer Address ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 Gerrit-Change-Number: 19979 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 13:16:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 13:16:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 13:16:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce tests TC_lu_and_{mo, mt}_call_ipv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 ) Change subject: msc: Introduce tests TC_lu_and_{mo,mt}_call_ipv6 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 13:16:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 13:17:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 4 Sep 2020 13:17:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 ) Change subject: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 Gerrit-Change-Number: 19980 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 13:17:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 14:18:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 14:18:50 +0000 Subject: Change in osmo-bts[master]: vty: add 'gsmtap-sapi (enable-all|disable-all)' command In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19978 ) Change subject: vty: add 'gsmtap-sapi (enable-all|disable-all)' command ...................................................................... vty: add 'gsmtap-sapi (enable-all|disable-all)' command It's more convenient to use one command to enable/disable sending of all kinds of UL/DL messages at once, rather than specifying all of them individually. Adjust config_write_bts_single(), so it would not print unknown GSMTAP SAPI entries if gsmtap_sapi_mask is set to UINT32_MAX. Change-Id: Icd7fce860ecdcf8ffa107bdfee7ec94ea9ea6cb2 --- M src/common/vty.c 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index 49e6edf..d5993d6 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -251,9 +251,12 @@ bts->agch_queue.thresh_level, bts->agch_queue.low_level, bts->agch_queue.high_level, VTY_NEWLINE); - for (i = 0; i < 32; i++) { + for (i = 0; i < sizeof(uint32_t) * 8; i++) { if (gsmtap_sapi_mask & ((uint32_t) 1 << i)) { - sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, i)); + sapi_buf = get_value_string_or_null(gsmtap_sapi_names, i); + if (sapi_buf == NULL) + continue; + sapi_buf = osmo_str_tolower(sapi_buf); vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } } @@ -1410,6 +1413,23 @@ "logical channel commands\n" \ "logical channel number\n" +DEFUN(cfg_trx_gsmtap_sapi_all, cfg_trx_gsmtap_sapi_all_cmd, + "gsmtap-sapi (enable-all|disable-all)", + "Enable/disable sending of UL/DL messages over GSMTAP\n" + "Enable all kinds of messages (all SAPI)\n" + "Disable all kinds of messages (all SAPI)\n") +{ + if (argv[0][0] == 'e') { + gsmtap_sapi_mask = UINT32_MAX; + gsmtap_sapi_acch = 1; + } else { + gsmtap_sapi_mask = 0x00; + gsmtap_sapi_acch = 0; + } + + return CMD_SUCCESS; +} + DEFUN(cfg_trx_gsmtap_sapi, cfg_trx_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { @@ -1721,6 +1741,7 @@ install_element(BTS_NODE, &cfg_bts_smscb_tgt_qlen_cmd); install_element(BTS_NODE, &cfg_bts_smscb_qhyst_cmd); + install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_all_cmd); install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_cmd); install_element(BTS_NODE, &cfg_trx_no_gsmtap_sapi_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd7fce860ecdcf8ffa107bdfee7ec94ea9ea6cb2 Gerrit-Change-Number: 19978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 14:38:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 14:38:42 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (ack) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (ack) ...................................................................... Support handling IPv6 Transport Address in Handover Request (ack) Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 --- M src/libmsc/ran_msg_a.c 1 file changed, 12 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/19982/1 diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index b13cc17..bf5fc68 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -607,23 +607,13 @@ } if (ie_aoip_transp_addr) { - do { struct sockaddr_storage rtp_addr; - if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { + if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); - break; - } - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - break; - } - if (osmo_sockaddr_str_from_sockaddr_in(&rtp_ran_local, (struct sockaddr_in*)&rtp_addr)) { + else if (osmo_sockaddr_str_from_sockaddr(&rtp_ran_local, (struct sockaddr*)&rtp_addr) < 0) LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); - break; - } - r->rtp_ran_local = &rtp_ran_local; - } while(0); + else + r->rtp_ran_local = &rtp_ran_local; } if (ie_codec_list_msc_preferred @@ -689,24 +679,14 @@ } if (ie_aoip_transp_addr) { - do { - struct sockaddr_storage rtp_addr; - if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); - break; - } - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - break; - } - if (osmo_sockaddr_str_from_sockaddr_in(&ran_dec_msg.handover_request_ack.remote_rtp, - (struct sockaddr_in*)&rtp_addr)) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); - ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){}; - break; - } - } while(0); + struct sockaddr_storage rtp_addr; + if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); + } else if (osmo_sockaddr_str_from_sockaddr(&ran_dec_msg.handover_request_ack.remote_rtp, + (struct sockaddr*)&rtp_addr)) { + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); + ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){}; + } } if (ie_speech_codec) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 14:39:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 14:39:13 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Support handling IPv6 Transport Address in Handover Request (Ack) Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 --- M src/libmsc/ran_msg_a.c 1 file changed, 12 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/19982/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 14:49:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 14:49:21 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 to look at the new patch set (#3). Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Support handling IPv6 Transport Address in Handover Request (Ack) Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 --- M src/libmsc/ran_msg_a.c 1 file changed, 12 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/19982/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 15:19:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 15:19:34 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19922/1/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19922/1/src/libmsc/ran_msg_a.c at a991 PS1, Line 991: if (rtp_addr_in.sin_port == 0) { Why are you removing this check? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 04 Sep 2020 15:19:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 15:30:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 15:30:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Fix wrong mgcp conn expected in several places In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 ) Change subject: msc: Fix wrong mgcp conn expected in several places ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0bb15881e640fe49552108679894d5df15339fc8 Gerrit-Change-Number: 19975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 15:30:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 15:33:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 15:33:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Add template helpers for AoIP Transport Layer Address In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 ) Change subject: library: Add template helpers for AoIP Transport Layer Address ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979/3/library/BSSMAP_Templates.ttcn File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979/3/library/BSSMAP_Templates.ttcn at 442 PS3, Line 442: return This style looks weird, but ok. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 Gerrit-Change-Number: 19979 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 15:33:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 15:34:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 15:34:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce tests TC_lu_and_{mo, mt}_call_ipv6 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 ) Change subject: msc: Introduce tests TC_lu_and_{mo,mt}_call_ipv6 ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974/3/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974/3/msc/MSC_Tests.ttcn at 6279 PS3, Line 6279: execute( TC_lu_and_mo_call_ipv6() ); TC_lu_and_mt_call_ipv6 is missing here -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 15:34:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 15:37:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 4 Sep 2020 15:37:31 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19949 ) Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 04 Sep 2020 15:37:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 18:36:50 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 4 Sep 2020 18:36:50 +0000 Subject: Change in osmo-trx[master]: transceiver: initialize reorder flag so we don't miscount References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19983 ) Change subject: transceiver: initialize reorder flag so we don't miscount ...................................................................... transceiver: initialize reorder flag so we don't miscount Change-Id: Ia7740b45611dbf09a406b3fd9f0a810d46c96bde --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/83/19983/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 76ae3d3..676ffde 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -63,7 +63,7 @@ TransceiverState::TransceiverState() : mFiller(FILLER_ZERO), mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), - mPower(0.0), mMuted(false) + mPower(0.0), mMuted(false), first_dl_fn_rcv() { for (int i = 0; i < 8; i++) { chanType[i] = Transceiver::NONE; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia7740b45611dbf09a406b3fd9f0a810d46c96bde Gerrit-Change-Number: 19983 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 19:29:55 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 4 Sep 2020 19:29:55 +0000 Subject: Change in osmo-trx[master]: transceiver: initialize reorder flag so we don't miscount In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19983 ) Change subject: transceiver: initialize reorder flag so we don't miscount ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia7740b45611dbf09a406b3fd9f0a810d46c96bde Gerrit-Change-Number: 19983 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 04 Sep 2020 19:29:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 19:29:59 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 4 Sep 2020 19:29:59 +0000 Subject: Change in osmo-trx[master]: transceiver: initialize reorder flag so we don't miscount In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19983 ) Change subject: transceiver: initialize reorder flag so we don't miscount ...................................................................... transceiver: initialize reorder flag so we don't miscount Change-Id: Ia7740b45611dbf09a406b3fd9f0a810d46c96bde --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 76ae3d3..676ffde 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -63,7 +63,7 @@ TransceiverState::TransceiverState() : mFiller(FILLER_ZERO), mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), - mPower(0.0), mMuted(false) + mPower(0.0), mMuted(false), first_dl_fn_rcv() { for (int i = 0; i < 8; i++) { chanType[i] = Transceiver::NONE; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia7740b45611dbf09a406b3fd9f0a810d46c96bde Gerrit-Change-Number: 19983 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 4 20:17:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 4 Sep 2020 20:17:30 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19922/1/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19922/1/src/libmsc/ran_msg_a.c at a991 PS1, Line 991: if (rtp_addr_in.sin_port == 0) { > Why are you removing this check? Good point. I'll address this. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 04 Sep 2020 20:17:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Sep 5 01:39:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 05 Sep 2020 01:39:53 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f52ec876bd77_12d02af35bf545f0753651@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 175s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 176s] [COMPILING libboard/qmod/source/card_pres.c] [ 176s] [COMPILING libboard/qmod/source/wwan_led.c] [ 176s] [COMPILING libboard/qmod/source/i2c.c] [ 176s] [COMPILING libboard/qmod/source/board_qmod.c] [ 176s] [COMPILING apps/dfu/main.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 177s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 177s] Memory region Used Size Region Size %age Used [ 177s] rom: 16588 B 16 KB 101.25% [ 177s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 177s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 177s] collect2: error: ld returned 1 exit status [ 177s] % [ 177s] make[2]: *** [Makefile:234: flash] Error 1 [ 177s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 177s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 177s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 177s] dh_auto_build: error: make -j1 returned exit code 2 [ 177s] make: *** [debian/rules:16: build] Error 25 [ 177s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 177s] ### VM INTERACTION START ### [ 180s] [ 171.099839] sysrq: Power Off [ 180s] [ 171.106036] reboot: Power down [ 180s] ### VM INTERACTION END ### [ 180s] [ 180s] lamb17 failed "build simtrace2_0.7.0.63.39070.dsc" at Sat Sep 5 01:39:45 UTC 2020. [ 180s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Sep 5 10:12:55 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 5 Sep 2020 10:12:55 +0000 Subject: Change in libosmo-sccp[master]: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 ) Change subject: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() ...................................................................... add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() Avoid magic number 0xffffffff and rather provide a mask value for all address components. Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07 --- M include/osmocom/sigtran/sccp_sap.h M src/sccp_user.c 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/84/19984/1 diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index 817ac45..de9b24c 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -51,6 +51,7 @@ #define OSMO_SCCP_ADDR_T_SSN 0x0004 /* subsystem number */ #define OSMO_SCCP_ADDR_T_IPv4 0x0008 #define OSMO_SCCP_ADDR_T_IPv6 0x0010 +#define OSMO_SCCP_ADDR_T_MASK 0x001f /* Q.713 3.4.1 + RFC 3868 3.10.2.3 */ enum osmo_sccp_routing_ind { diff --git a/src/sccp_user.c b/src/sccp_user.c index e1329ac..880cab1 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -342,8 +342,8 @@ * The SCCP addresses' Routing Indicator is not compared, see osmo_sccp_addr_ri_cmp(). * \param[in] a left side. * \param[in] b right side. - * \param[in] presence_criteria A bitmask of OSMO_SCCP_ADDR_T_* values, or 0xffffffff to compare all parts, except the - * routing indicator. + * \param[in] presence_criteria A bitmask of OSMO_SCCP_ADDR_T_* values, or OSMO_SCCP_ADDR_T_MASK to compare all parts, + * except the routing indicator. * \return -1 if a < b, 1 if a > b, and 0 if all checked values match. */ int osmo_sccp_addr_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b, uint32_t presence_criteria) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07 Gerrit-Change-Number: 19984 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 11:15:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 11:15:43 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: fix misleading comment in header References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19985 ) Change subject: osmo-bts-trx/trx_provision_fsm: fix misleading comment in header ...................................................................... osmo-bts-trx/trx_provision_fsm: fix misleading comment in header Change-Id: Iff9f073ce65bc443109107bb895124ec38dbbb10 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/19985/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index f075e98..838433e 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -1,4 +1,4 @@ -/* BTS shutdown FSM */ +/* TRX provision FSM */ /* (C) 2020 by sysmocom - s.m.f.c. GmbH * Author: Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iff9f073ce65bc443109107bb895124ec38dbbb10 Gerrit-Change-Number: 19985 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 11:18:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 11:18:42 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19986 ) Change subject: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function ...................................................................... osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function Change-Id: I56d2777bcc43c96b9fa1672d3ad29bf9817208bb --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/19986/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 838433e..fba4712 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -289,7 +289,7 @@ int status; bool others_ready; - switch(event) { + switch (event) { case TRX_PROV_EV_CFG_ENABLE: l1h->config.enabled =(bool)data; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I56d2777bcc43c96b9fa1672d3ad29bf9817208bb Gerrit-Change-Number: 19986 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 12:11:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 12:11:12 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if: clarify logging message in bts_model_opstart() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19987 ) Change subject: osmo-bts-trx/l1_if: clarify logging message in bts_model_opstart() ...................................................................... osmo-bts-trx/l1_if: clarify logging message in bts_model_opstart() Change-Id: I3d4a4473541327488d3393b1fa7c6391afb3728a --- M src/osmo-bts-trx/l1_if.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/19987/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index a2b3415..d47e2de 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -611,8 +611,10 @@ void *obj) { int rc; - LOGP(DOML, LOGL_DEBUG, "bts_model_opstart: %s received\n", + + LOGP(DOML, LOGL_DEBUG, "Rx OPSTART for %s MO\n", get_value_string(abis_nm_obj_class_names, mo->obj_class)); + switch (mo->obj_class) { case NM_OC_RADIO_CARRIER: /* activate transceiver */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3d4a4473541327488d3393b1fa7c6391afb3728a Gerrit-Change-Number: 19987 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 12:44:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 12:44:42 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19988 ) Change subject: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly ...................................................................... osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly It was reported that both osmo-bsc and osmo-bts-trx may end up running in a half-broken state, when everything looks good and the UEs can see the network, but all channel requests get rejected due to "trx not usable" error: lchan_select.c:173 (bts=0) lchan_select_by_type(SDCCH) lchan_select.c:48 looking for lchan CCCH+SDCCH4: (bts=0,trx=0) trx not usable lchan_select.c:48 looking for lchan SDCCH8: (bts=0,trx=0) trx not usable lchan_select.c:239 (bts=0) Failed to select SDCCH channel lchan_select.c:173 (bts=0) lchan_select_by_type(TCH_H) lchan_select.c:48 looking for lchan TCH/H: (bts=0,trx=0) trx not usable lchan_select.c:239 (bts=0) Failed to select TCH_H channel lchan_select.c:173 (bts=0) lchan_select_by_type(TCH_F) lchan_select.c:48 looking for lchan TCH/F: (bts=0,trx=0) trx not usable lchan_select.c:239 (bts=0) Failed to select TCH_F channel As was then figured out, this happens because the Radio Carrier MO (Managed Object) remains Disabled even after the BSC has sent OPSTART and the BTS ACKed it: oml.c:986 OC=RADIO-CARRIER(02) INST=(00,00,ff): Rx OPSTART l1_if.c:614 Rx OPSTART for RADIO-CARRIER MO l1_if.c:201 TRX_PROV(phy0-0)[0x1238c0]{OPEN_POWERON}: Event TRX_PROV_EV_CFG_ENABLE not permitted oml.c:144 OC=RADIO-CARRIER(02) INST=(00,00,ff): Tx Opstart Ack It remains a mistery why the TRX_PROV FSM is already in state OPEN_POWERON, while it's expected to be in state OPEN_POWEROFF, but we definitely should not ACKnowledge the OPSTART if this happens. Send a NACK instead with cause NM_NACK_CANT_PERFORM. Change-Id: I8727460acbf850b84df67a9cbdc25b47dee1fadd Related: SYS#5063 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/19988/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index d47e2de..22e5aad 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -197,8 +197,11 @@ { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; + int rc; - osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true); + rc = osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true); + if (rc != 0) + return oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); if (trx == trx->bts->c0) lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8727460acbf850b84df67a9cbdc25b47dee1fadd Gerrit-Change-Number: 19988 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 13:09:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 13:09:20 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19827 ) Change subject: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler ...................................................................... Patch Set 2: Code-Review+2 (1 comment) LGTM! https://gerrit.osmocom.org/c/osmo-bts/+/19827/2/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/19827/2/src/osmo-bts-trx/l1_if.c at a218 PS2, Line 218: trx_sched_reset BTW, after this change this function becomes unused. We can remove it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1423ddb390ef327ec7d4a27de2ac5dca663773a5 Gerrit-Change-Number: 19827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Hoernchen Gerrit-Comment-Date: Sat, 05 Sep 2020 13:09:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 13:14:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 13:14:44 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19986 to look at the new patch set (#2). Change subject: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function ...................................................................... osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function Change-Id: I56d2777bcc43c96b9fa1672d3ad29bf9817208bb --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/19986/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I56d2777bcc43c96b9fa1672d3ad29bf9817208bb Gerrit-Change-Number: 19986 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 13:14:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 13:14:44 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if: drop redundant logging message In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19987 to look at the new patch set (#2). Change subject: osmo-bts-trx/l1_if: drop redundant logging message ...................................................................... osmo-bts-trx/l1_if: drop redundant logging message We already get quite informative message originated from oml.c: OC=RADIO-CARRIER(02) INST=(00,00,ff): Rx OPSTART Change-Id: I3d4a4473541327488d3393b1fa7c6391afb3728a --- M src/osmo-bts-trx/l1_if.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/19987/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3d4a4473541327488d3393b1fa7c6391afb3728a Gerrit-Change-Number: 19987 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 14:06:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 14:06:37 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: add missing default labels References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19989 ) Change subject: osmo-bts-trx/trx_provision_fsm: add missing default labels ...................................................................... osmo-bts-trx/trx_provision_fsm: add missing default labels Change-Id: I494ea9eb64634a03575a52750273cee7c68a8b3a --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/19989/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index ad82961..2e3115a 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -266,6 +266,8 @@ trx_if_cmd_poweroff(l1h, NULL); /* TODO: jump to poweroff upon cb received */ trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF); break; + default: + OSMO_ASSERT(0); } } @@ -444,6 +446,8 @@ case TRX_PROV_EV_CFG_TS: update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); break; + default: + OSMO_ASSERT(0); } } @@ -515,6 +519,8 @@ } break; + default: + OSMO_ASSERT(0); } } @@ -538,6 +544,8 @@ } } break; + default: + OSMO_ASSERT(0); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I494ea9eb64634a03575a52750273cee7c68a8b3a Gerrit-Change-Number: 19989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 15:47:13 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 5 Sep 2020 15:47:13 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... Patch Set 20: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19143/20/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19143/20/src/socket.c at 1019 PS20, Line 1019: return osmo_fd_init_ofd(ofd, osmo_sock_init_osa(type, proto, local, remote, flags)); > I think I already commented on this: First check for return of osmo_sock_init_osa(), and if it fails [?] we're doing it in every _ofd() function and the _ofd function checks the returncode early. If this is here a problem, let's do another commit fixing it for all _ofd function. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Sat, 05 Sep 2020 15:47:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 18:00:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 18:00:15 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 to look at the new patch set (#3). Change subject: encoding: implement handing of hopping parameters ...................................................................... encoding: implement handing of hopping parameters The following test cases verify coding of the hopping parameters: + (RR) Immediate Assignment - TC_pcuif_fh_imm_ass_ul_egprs, - TC_pcuif_fh_imm_ass_ul, - TC_pcuif_fh_imm_ass_dl, + (RLC/MAC) Packet Uplink/Downlink Assignment: - TC_pcuif_fh_pkt_ass_ul, - TC_pcuif_fh_pkt_ass_dl, all of them pass with this (and the upcoming) change applied. Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Related: SYS#4868, OS#4547 --- M src/encoding.cpp M src/pdch.h 2 files changed, 71 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/19788/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 18:01:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 18:01:22 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19788 ) Change subject: encoding: implement handing of hopping parameters ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19788/2/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19788/2/src/encoding.cpp at 689 PS2, Line 689: gen_freq_params(fp, tbf); > IMHO this should be called and cached whenever the FH properties change, not every time we want to g [?] I will implement this in a separate change if you don't mind. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 05 Sep 2020 18:01:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 18:10:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 18:10:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Related: SYS#4868, OS#4547 --- M pcu/PCU_Tests.ttcn 1 file changed, 19 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/19990/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 9bcf9c6..2d20975 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2161,6 +2161,15 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Randomly generate a set of hopping parameters for one timeslot */ +private function f_TC_pcuif_fh_params_gen(integer ma_len) +return template (value) PCUIF_InfoTrxTs { + return ts_PCUIF_InfoTrxTsH1(tsc := f_rnd_int(7), + hsn := f_rnd_int(63), + maio := f_rnd_int(63), + ma := f_rnd_bitstring(ma_len)); +} + private function f_TC_pcuif_fh_check_imm_ass(in PCUIF_info_ind info_ind, in GsmRrMessage rr_msg) { @@ -2210,12 +2219,8 @@ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(32)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(32); /* Initialize the PCU interface abstraction */ f_init_raw(testcasename(), info_ind); @@ -2235,12 +2240,8 @@ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(32)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(32); /* Initialize the PCU interface abstraction */ f_init_raw(testcasename(), info_ind); @@ -2257,12 +2258,8 @@ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(16)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(16); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -2331,12 +2328,8 @@ var GprsMS ms := valueof(t_GprsMS_def); var uint32_t poll_fn; - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(33)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(33); /* Initialize the PCU interface abstraction */ f_init_raw(testcasename(), info_ind); @@ -2377,12 +2370,8 @@ var RlcmacDlBlock dl_block; var uint32_t poll_fn; - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(33)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(33); /* Initialize NS/BSSGP side */ f_init_bssgp(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 18:10:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 5 Sep 2020 18:10:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add Mobile Allocation length field References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 ) Change subject: library/PCUIF_Types: version 10: add Mobile Allocation length field ...................................................................... library/PCUIF_Types: version 10: add Mobile Allocation length field My initial assumption was that we can skip redundant '0'B bits or even '00'O octets in the Mobile Allocation IE, and thus reduce the overall size of this element. Unfortunately, this is wrong. 3GPP TS 44.018, section 10.5.2.21 clearly states that the Mobile Allocation IE contains a bit-string of size NF, where NF is the number of frequencies in the cell allocation. If NF % 8 != 0, then '0'B padding bits must be appended to make it octet-aligned. In other words, if the cell allocation contains let's say 13 frequencies, but a hopping timeslot makes use of only a small fraction of it (e.g. 4 first channels), we would still need to transmit at least 13 bits (+padding), including all redundant bits and octets. In RLC/MAC frames though it's not required to make the bit-string octet aligned, so we need to send exactly NF bits without padding. In order to achieve that: a) add MA length field to INFO.ind (record PCUIF_InfoTrxTs); b) ajust the existing test cases to use this field. It's safe to merge this change as the related patches have not been merged to osmo-pcu and osmo-bts yet. Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Related: SYS#4868, OS#4547 --- M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 15 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/19991/1 diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 8144d97..f0200af 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -145,6 +145,7 @@ uint8_t hopping, uint8_t hsn, uint8_t maio, + uint8_t ma_bit_len, bitstring ma length(64) } with { variant (ma) "BYTEORDER(first), BITORDER(msb)" }; private type record length(8) of PCUIF_InfoTrxTs PCUIF_InfoTrxTsList; @@ -709,12 +710,14 @@ tsc := tsc, hopping := 0, hsn := 0, maio := 0, + ma_bit_len := 0, ma := f_pad_bit(''B, 64, '0'B) }; template PCUIF_InfoTrxTs tr_PCUIF_InfoTrxTsH0(template uint3_t tsc := ?) := { tsc := tsc, hopping := 0, hsn := ?, maio := ?, + ma_bit_len := ?, ma := ? }; @@ -726,16 +729,19 @@ hopping := 1, hsn := hsn, maio := maio, + ma_bit_len := lengthof(valueof(ma)), ma := f_pad_bit(valueof(ma), 64, '0'B) }; template PCUIF_InfoTrxTs tr_PCUIF_InfoTrxTsH1(template uint3_t tsc := ?, template uint6_t hsn := ?, template uint6_t maio := ?, - template bitstring ma := ?) := { + template bitstring ma := ?, + template uint8_t ma_bit_len := ?) := { tsc := tsc, hopping := 1, hsn := hsn, maio := maio, + ma_bit_len := ma_bit_len, ma := ma }; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 2d20975..a4596bf 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2193,18 +2193,12 @@ ia.pkt_chan_desc, " vs ", tr_pkt_chan_desc); } - var MobileAllocationLV tr_ma := { len := 0, ma := ''B }; - var octetstring ma_oct := bit2oct(ts.ma); - - /* Calculate length of the useful part of Mobile Allocation */ - for (var integer i := 0; i < lengthof(ma_oct); i := i + 1) { - if (ma_oct[i] != '00'O) { - tr_ma.len := i + 1; - } - } - - /* Strip zero bytes from the right side of MA */ - tr_ma.ma := substr(ts.ma, 0, tr_ma.len * 8); + /* Mobile Allocation is expected to be octet-aligned */ + var uint8_t ma_oct_len := (ts.ma_bit_len + 8 - 1) / 8; + var template MobileAllocationLV tr_ma := { + len := ma_oct_len, /* in bytes */ + ma := substr(ts.ma, 0, ma_oct_len * 8) + }; if (not match(ia.mobile_allocation, tr_ma)) { setverdict(fail, "Mobile Allocation does not match: ", @@ -2284,14 +2278,6 @@ { /* FIXME: TRX0/TS7 is a hard-coded expectation, make it configurable */ var PCUIF_InfoTrxTs ts := info_ind.trx.v10[0].ts[7]; - var integer ma_bit_len := 0; - - /* Calculate length of the useful part of Mobile Allocation */ - for (var integer i := 0; i < lengthof(ts.ma); i := i + 1) { - if (ts.ma[i] == '1'B) { - ma_bit_len := i + 1; - } - } /* Table 12.8.1: Frequency Parameters information elements */ var template FrequencyParameters tr_fp := { @@ -2307,8 +2293,8 @@ rfl_number_list_present := '0'B, rfl_number_list := omit, ma_present := '0'B, /* inverted logic */ - ma_length := ma_bit_len, - ma_bitmap := substr(ts.ma, 0, ma_bit_len) + ma_length := ts.ma_bit_len, + ma_bitmap := substr(ts.ma, 0, ts.ma_bit_len) } }, direct2 := omit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Gerrit-Change-Number: 19991 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 21:14:01 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 5 Sep 2020 21:14:01 +0000 Subject: Change in osmo-sip-connector[master]: Revert "sip: Specify invite contact tag" References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 ) Change subject: Revert "sip: Specify invite contact tag" ...................................................................... Revert "sip: Specify invite contact tag" This reverts commit 52b2afce2ca902bbae4a550d03d471be784efe28. The contact header is generated by the original sofia-sip library. By adding the contact header explicit as user header it violates the SIP RFC because sofia will add the Contact header to the BYE message as well. Let's fix the bugs in the freeswitch sofia-sip and make it compatible (not bug compatible) with the original sofia-sip. Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 --- M src/sip.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/92/19992/1 diff --git a/src/sip.c b/src/sip.c index 61916c9..c635542 100644 --- a/src/sip.c +++ b/src/sip.c @@ -597,9 +597,6 @@ called_num, agent->app->sip.remote_addr, agent->app->sip.remote_port); - char *contact = talloc_asprintf(leg, "sip:%s:%d", - agent->app->sip.local_addr, - agent->app->sip.local_port); char *sdp = sdp_create_file(leg, other, sdp_sendrecv); leg->state = SIP_CC_INITIAL; @@ -607,7 +604,6 @@ nua_invite(leg->nua_handle, SIPTAG_FROM_STR(from), SIPTAG_TO_STR(to), - SIPTAG_CONTACT_STR(contact), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR("application/sdp"), SIPTAG_PAYLOAD_STR(sdp), @@ -616,7 +612,6 @@ leg->base.call->remote = &leg->base; talloc_free(from); talloc_free(to); - talloc_free(contact); talloc_free(sdp); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 Gerrit-Change-Number: 19992 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 23:15:49 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Sat, 5 Sep 2020 23:15:49 +0000 Subject: Change in osmo-sip-connector[master]: Revert "sip: Specify invite contact tag" In-Reply-To: References: Message-ID: matt9j has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 ) Change subject: Revert "sip: Specify invite contact tag" ...................................................................... Patch Set 1: This change seems correct to me so I'll provide a +1 for code review. I will defer to the community two questions though: Firstly, is there a correct way to specify the contact header as a library user of sofia-sip? I am not sure if having the library infer the contact header is the ideal behavior, since this functionality was removed in freeswitch sofia-sip years ago and has not been raised there as an issue. If the contact header is being included in the BYE message against the RFC, is that an additional bug which should be filed, or did I not specify the contact header correctly? As stated in my original patch I am not a sip expert, so I will defer to the collective experience of the community here. Secondly, I am not sure when changes will be made to freeswitch's library. Reverting this patch now will make osmo-sip-connector and freeswitch's libsofia-sip incompatible again. I can raise this issue in the freeswitch slack and on github again, but I am not sure when it will be addressed. It may be worth considering holding on merging this revert until there is a clear path forward on that end. I can patch my local build, but anyone else using freeswitch with osmo-sip-connector will run into the same problem. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 Gerrit-Change-Number: 19992 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Sat, 05 Sep 2020 23:15:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 5 23:20:08 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Sat, 5 Sep 2020 23:20:08 +0000 Subject: Change in osmo-sip-connector[master]: Revert "sip: Specify invite contact tag" In-Reply-To: References: Message-ID: matt9j has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 ) Change subject: Revert "sip: Specify invite contact tag" ...................................................................... Patch Set 1: > Patch Set 1: > > This change seems correct to me so I'll provide a +1 for code review. I will defer to the community two questions though: > > Firstly, is there a correct way to specify the contact header as a library user of sofia-sip? I am not sure if having the library infer the contact header is the ideal behavior, since this functionality was removed in freeswitch sofia-sip years ago and has not been raised there as an issue. If the contact header is being included in the BYE message against the RFC, is that an additional bug which should be filed, or did I not specify the contact header correctly? As stated in my original patch I am not a sip expert, so I will defer to the collective experience of the community here. > > Secondly, I am not sure when changes will be made to freeswitch's library. Reverting this patch now will make osmo-sip-connector and freeswitch's libsofia-sip incompatible again. I can raise this issue in the freeswitch slack and on github again, but I am not sure when it will be addressed. It may be worth considering holding on merging this revert until there is a clear path forward on that end. I can patch my local build, but anyone else using freeswitch with osmo-sip-connector will run into the same problem. It seems like I currently do not have permissions to edit the code review label yet, but have reviewed the change and commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 Gerrit-Change-Number: 19992 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Sat, 05 Sep 2020 23:20:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 01:08:22 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 01:08:22 +0000 Subject: Change in osmo-sip-connector[master]: Revert "sip: Specify invite contact tag" In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 ) Change subject: Revert "sip: Specify invite contact tag" ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > This change seems correct to me so I'll provide a +1 for code review. I will defer to the community two questions though: > > > > Firstly, is there a correct way to specify the contact header as a library user of sofia-sip? I am not sure if having the library infer the contact header is the ideal behavior, since this functionality was removed in freeswitch sofia-sip years ago and has not been raised there as an issue. If the contact header is being included in the BYE message against the RFC, is that an additional bug which should be filed, or did I not specify the contact header correctly? As stated in my original patch I am not a sip expert, so I will defer to the collective experience of the community here. > > > > Secondly, I am not sure when changes will be made to freeswitch's library. Reverting this patch now will make osmo-sip-connector and freeswitch's libsofia-sip incompatible again. I can raise this issue in the freeswitch slack and on github again, but I am not sure when it will be addressed. It may be worth considering holding on merging this revert until there is a clear path forward on that end. I can patch my local build, but anyone else using freeswitch with osmo-sip-connector will run into the same problem. > > It seems like I currently do not have permissions to edit the code review label yet, but have reviewed the change and commit message. I've the feeling the freewswitch sofia-sip was used to fix problems in a hacky way or in a freeswitch-only way. To be specific when reading the freeswitch jira issue FS-4102 together with the commit afb119aba813b2357203729ebdda555513ad56c2 it doesn't sound like they found the root of the problem. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 Gerrit-Change-Number: 19992 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Sun, 06 Sep 2020 01:08:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Sep 6 01:32:31 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 06 Sep 2020 01:32:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f543c3bf40d_12d02af35bf545f010024b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 242s] building additional files... [ 242s] checking if compiling is necessary... [ 242s] the output file doesn't exist [ 242s] pdflatex -interaction=batchmode test-usermanual.tex [ 242s] pdflatex failed [ 242s] test-usermanual.tex:1676: pdfTeX error (ext4): \pdfendlink ended up in different nesting level than \pdfstartlink. [ 242s] test-usermanual.tex:1676: leading text: \end{longtable} [ 242s] [ 242s] A possible reason for transformation failure is invalid DocBook [ 242s] (as reported by xmllint) [ 242s] [ 242s] Error: pdflatex compilation failed [ 242s] [ 242s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 242s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 242s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 242s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 242s] make[1]: *** [Makefile:362: all] Error 2 [ 242s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 242s] dh_auto_build: make -j1 returned exit code 2 [ 242s] make: *** [debian/rules:5: binary] Error 2 [ 242s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 242s] ### VM INTERACTION START ### [ 245s] [ 237.001919] sysrq: Power Off [ 245s] [ 237.005028] reboot: Power down [ 245s] ### VM INTERACTION END ### [ 245s] [ 245s] sheep86 failed "build osmo-gsm-manuals-dev_0.3.0.19.0ef6.dsc" at Sun Sep 6 01:32:27 UTC 2020. [ 245s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Sep 6 01:38:31 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 06 Sep 2020 01:38:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f543da042e16_12d02af35bf545f010045bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 185s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 185s] [COMPILING libboard/qmod/source/card_pres.c] [ 185s] [COMPILING libboard/qmod/source/wwan_led.c] [ 185s] [COMPILING libboard/qmod/source/i2c.c] [ 186s] [COMPILING libboard/qmod/source/board_qmod.c] [ 186s] [COMPILING apps/dfu/main.c] [ 186s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 186s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 186s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 187s] Memory region Used Size Region Size %age Used [ 187s] rom: 16588 B 16 KB 101.25% [ 187s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 187s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 187s] collect2: error: ld returned 1 exit status [ 187s] % [ 187s] make[2]: *** [Makefile:234: flash] Error 1 [ 187s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 187s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 187s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 187s] dh_auto_build: error: make -j1 returned exit code 2 [ 187s] make: *** [debian/rules:16: build] Error 25 [ 187s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 187s] ### VM INTERACTION START ### [ 190s] [ 179.644653] sysrq: Power Off [ 190s] [ 179.650675] reboot: Power down [ 190s] ### VM INTERACTION END ### [ 190s] [ 190s] lamb06 failed "build simtrace2_0.7.0.63.39070.dsc" at Sun Sep 6 01:38:27 UTC 2020. [ 190s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Sep 6 05:45:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 05:45:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 ) Change subject: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back ...................................................................... BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back Change [1] introduced a regression that caused some TC_cbsp_* test cases to fail. The problem is that TC_fh_params_si4_cbch re-configures TS0 as CCCH+SDCCH4 instead of CCCH+SDCCH4+CBCH, so the CBCH channel vanishes after this test case is executed. [1] Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/19993/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fb9fa68..4c8c471 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7222,7 +7222,7 @@ f_vty_enter_cfg_trx(BSCVTY, trx := 0); f_vty_transceive(BSCVTY, "timeslot 0"); - f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4+cbch"); f_vty_transceive(BSCVTY, "exit"); /* go back */ f_vty_transceive(BSCVTY, "timeslot 1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Gerrit-Change-Number: 19993 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 05:45:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 05:45:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: call f_shutdown_helper() in all TC_fh_params_* References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 ) Change subject: BSC_Tests: call f_shutdown_helper() in all TC_fh_params_* ...................................................................... BSC_Tests: call f_shutdown_helper() in all TC_fh_params_* Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/19994/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4c8c471..1843da2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7023,7 +7023,7 @@ /* Disable frequency hopping */ f_TC_fh_params_unset(fhp); - setverdict(pass); + f_shutdown_helper(); } /* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Immediate Assignment */ @@ -7071,7 +7071,7 @@ /* Disable frequency hopping */ f_TC_fh_params_unset(fhp); - setverdict(pass); + f_shutdown_helper(); } /* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Assignment Command */ @@ -7150,7 +7150,7 @@ /* Disable frequency hopping */ f_TC_fh_params_unset(fhp); - setverdict(pass); + f_shutdown_helper(); } /* Verify the hopping parameters in System Information Type 4 */ @@ -7229,7 +7229,7 @@ f_vty_transceive(BSCVTY, "phys_chan_config tch/f"); f_vty_transceive(BSCVTY, "end"); /* we're done */ - setverdict(pass); + f_shutdown_helper(); } /* Dyn PDCH todo: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 Gerrit-Change-Number: 19994 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 06:11:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 06:11:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 to look at the new patch set (#2). Change subject: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back ...................................................................... BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back Change [1] introduced a regression that caused some TC_cbsp_* test cases to fail. The problem is that TC_fh_params_si4_cbch re-configures TS0 as CCCH+SDCCH4 instead of CCCH+SDCCH4+CBCH, so the CBCH channel vanishes after this test case is executed. [1] Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/19993/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Gerrit-Change-Number: 19993 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 06:12:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 06:12:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_handover_cmd In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 ) Change subject: BSC_Tests/hopping: add TC_fh_params_handover_cmd ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Gerrit-Change-Number: 19943 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 06:12:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 06:15:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 06:15:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_handover_cmd In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 to look at the new patch set (#4). Change subject: BSC_Tests/hopping: add TC_fh_params_handover_cmd ...................................................................... BSC_Tests/hopping: add TC_fh_params_handover_cmd Similar to TC_fh_params_assignment_cmd, this test case verifies presence and correctness of the hopping parameters in the following messages and their IEs: 1. (RR) Handover Command 1.1. Description of the First Channel, after time IE 1.2. Cell Channel Description IE (presence) 1.3. Mobile Allocation, after time IE The hopping parameters are randomly generated and configured via the VTY interface in the beginning, and unset in the end. Since the C0/TS0 (BCCH+SDCCH4+CBCH) shall not be hopping, let's temporarily re-configure TS0 as BCCH, and TS1 as SDCCH8 on TRX0 of BTS1 (handover tagret). Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 101 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/19943/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Gerrit-Change-Number: 19943 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 07:08:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 07:08:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 to look at the new patch set (#3). Change subject: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* ...................................................................... BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/19994/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 Gerrit-Change-Number: 19994 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 07:08:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 07:08:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 ) Change subject: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask ...................................................................... BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask My initial assumption was that we can skip redundant '0'B bits or even '00'O octets in the Mobile Allocation IE, and thus reduce the overall size of this element. Unfortunately, this is wrong. 3GPP TS 44.018, section 10.5.2.21 clearly states that the Mobile Allocation IE contains a bit-string of size NF, where NF is the number of frequencies in the cell allocation. If NF % 8 != 0, then '0'B padding bits must be appended to make it octet-aligned. In other words, if the cell allocation contains let's say 13 frequencies, but a hopping timeslot makes use of only a small fraction of it (e.g. 4 first channels), we would still need to transmit at least 13 bits (+padding), including all redundant bits and octets. Change-Id: Ia79efc9aa07b5088913d6679715f351d30f48d13 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/19995/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8944447..de35e23 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6889,7 +6889,6 @@ var bitstring full_mask := f_pad_bit(''B, 1024, '0'B); var bitstring slot_mask := f_pad_bit(''B, 1024, '0'B); var bitstring ma_mask := ''B; - var integer ma_mask_len := 0; /* Compose the full bit-mask (all channels, up to 1024 entries) */ for (var integer i := 0; i < lengthof(fhp); i := i + 1) { @@ -6913,15 +6912,13 @@ /* FIXME: ma_mask := ma_mask & slot_mask[i]; // triggers a bug in TITAN */ if (slot_mask[i] == '1'B) { ma_mask := ma_mask & '1'B; - ma_mask_len := lengthof(ma_mask); } else { ma_mask := ma_mask & '0'B; } } /* Ensure that ma_mask is octet-aligned */ - ma_mask := substr(ma_mask, 0, ma_mask_len); - ma_mask_len := (ma_mask_len + 8 - 1) / 8; + var integer ma_mask_len := (lengthof(ma_mask) + 8 - 1) / 8; ma_mask := f_pad_bit(ma_mask, ma_mask_len * 8, '0'B); return { len := ma_mask_len, ma := ma_mask }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia79efc9aa07b5088913d6679715f351d30f48d13 Gerrit-Change-Number: 19995 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 08:53:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 08:53:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: also verify handling of ARFCN 0 in MA References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19996 ) Change subject: BSC_Tests/hopping: also verify handling of ARFCN 0 in MA ...................................................................... BSC_Tests/hopping: also verify handling of ARFCN 0 in MA According to 3GPP TS 44.018, table 10.5.2.21.1 "Mobile Allocation information element", in the cell allocation frequency list the absolute RF channel numbers are placed in increasing order of ARFCN, except that ARFCN 0, if included in the set, is put in the last position in the list. Let's verify that the IUT handles this corner case correctly. Change-Id: I3afadfde03f6ea766c0756a181ef129e4b05c383 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/19996/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f16fab4..08baaf2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6837,6 +6837,11 @@ fhp[tn].ma := fhp[tn].ma & { i * step }; } + /* NOTE: ARFCN 0 goes to the end of the MA list */ + if (step mod 2 > 0) { /* pseudo-random decision */ + fhp[tn].ma := fhp[tn].ma & { 0 }; + } + fhp[tn].enabled := true; } @@ -6905,7 +6910,7 @@ } /* Finally, compose the Mobile Allocation bit-mask */ - for (var integer i := 0; i < lengthof(full_mask); i := i + 1) { + for (var integer i := 1; i < lengthof(full_mask); i := i + 1) { if (full_mask[i] != '1'B) { continue; } @@ -6917,6 +6922,16 @@ } } + /* ARFCN 0 (if present) is put in the last position in the list */ + if (full_mask[0] == '1'B) { + /* FIXME: ma_mask := ma_mask & slot_mask[0]; // triggers a bug in TITAN */ + if (slot_mask[0] == '1'B) { + ma_mask := ma_mask & '1'B; + } else { + ma_mask := ma_mask & '0'B; + } + } + /* Ensure that ma_mask is octet-aligned */ var integer ma_mask_len := (lengthof(ma_mask) + 8 - 1) / 8; ma_mask := f_pad_bit(ma_mask, ma_mask_len * 8, '0'B); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3afadfde03f6ea766c0756a181ef129e4b05c383 Gerrit-Change-Number: 19996 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 16:15:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 16:15:52 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19997 ) Change subject: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro ...................................................................... generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro Change-Id: I119f930e9cb5d6e52d4b0e1160604c709d942a18 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/19997/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 95eab4a..5aa52cf 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -258,9 +258,7 @@ } /* pad it to octet-aligned number of bits */ - ts->hopping.ma_len = num_cell_arfcns / 8; - if (num_cell_arfcns % 8) - ts->hopping.ma_len++; + ts->hopping.ma_len = OSMO_BYTES_FOR_BITS(num_cell_arfcns); n_chan = 0; for (i = 0; i < 1024; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I119f930e9cb5d6e52d4b0e1160604c709d942a18 Gerrit-Change-Number: 19997 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 16:15:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 6 Sep 2020 16:15:57 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19998 ) Change subject: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) ...................................................................... generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) According to 3GPP TS 44.018, table 10.5.2.21.1 "Mobile Allocation information element", in the cell allocation frequency list the absolute RF channel numbers are placed in increasing order, except that ARFCN 0, if included in the set, is put in the last position. This basically means that the last bit of the Mobile Allocation (MSB on the wire) corresponds to ARFCN 0, if it's included in the cell allocation frequency list, or the last channel otherwise. Recently introduced TTCN-3 test cases uncover the following problems: a) ARFCN 0 is encoded twice: as MSB and LSB of the bit-mask, b) ARFCN 0 is encoded one bit off its expected location. Change-Id: I264a66a1405e72940a79e9e20ad6ad8f269a7bbc Related: SYS#4868, OS#4545 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/19998/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5aa52cf..ebae0a2 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -261,7 +261,7 @@ ts->hopping.ma_len = OSMO_BYTES_FOR_BITS(num_cell_arfcns); n_chan = 0; - for (i = 0; i < 1024; i++) { + for (i = 1; i < 1024; i++) { if (!bitvec_get_bit_pos(cell_chan, i)) continue; /* set the corresponding bit in the MA */ @@ -275,7 +275,6 @@ /* ARFCN 0 is special: It is coded last in the bitmask */ if (bitvec_get_bit_pos(cell_chan, 0)) { - n_chan++; /* set the corresponding bit in the MA */ bitnum = (ts->hopping.ma_len * 8) - 1 - n_chan; if (bitvec_get_bit_pos(ts_arfcn, 0)) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I264a66a1405e72940a79e9e20ad6ad8f269a7bbc Gerrit-Change-Number: 19998 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 17:13:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 17:13:23 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... Patch Set 20: Code-Review+1 Then please submit a fix in a separate patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Sun, 06 Sep 2020 17:13:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 19:42:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 19:42:26 +0000 Subject: Change in libosmocore[master]: bssgp: remove superfluous whitespace References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19999 ) Change subject: bssgp: remove superfluous whitespace ...................................................................... bssgp: remove superfluous whitespace Change-Id: Ic66f7e640cd473fa2c8473a3e91f57332ae9bf6a --- M src/gb/gprs_bssgp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/19999/1 diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index fa4e187..9c119fb 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -73,7 +73,7 @@ uint32_t llc_pdu_len, void *priv); -/* callback to be backward compatible with old users which do not set the bssgp_ns_send function */ +/* callback to be backward compatible with old users which do not set the bssgp_ns_send function */ static int _gprs_ns_sendmsg(void *ctx, struct msgb *msg) { return gprs_ns_sendmsg(bssgp_nsi, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic66f7e640cd473fa2c8473a3e91f57332ae9bf6a Gerrit-Change-Number: 19999 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 19:42:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 19:42:27 +0000 Subject: Change in libosmocore[master]: gb/common_vty: use void * References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20000 ) Change subject: gb/common_vty: use void * ...................................................................... gb/common_vty: use void * As long the filter doesn't look into the nsvc/bvc structs there is no need to use the type. Further it allows to use the same code for NS1 and NS2. Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac --- M src/gb/common_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/20000/1 diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c index a47294b..eb665d5 100644 --- a/src/gb/common_vty.c +++ b/src/gb/common_vty.c @@ -40,8 +40,8 @@ int gprs_log_filter_fn(const struct log_context *ctx, struct log_target *tar) { - const struct gprs_nsvc *nsvc = ctx->ctx[LOG_CTX_GB_NSVC]; - const struct gprs_bvc *bvc = ctx->ctx[LOG_CTX_GB_BVC]; + const void *nsvc = ctx->ctx[LOG_CTX_GB_NSVC]; + const void *bvc = ctx->ctx[LOG_CTX_GB_BVC]; /* Filter on the NS Virtual Connection */ if ((tar->filter_map & (1 << LOG_FLT_GB_NSVC)) != 0 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac Gerrit-Change-Number: 20000 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 19:48:31 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 19:48:31 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... Patch Set 20: Code-Review+2 1+1 = 2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Sun, 06 Sep 2020 19:48:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 19:48:47 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 19:48:47 +0000 Subject: Change in libosmocore[master]: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd ...................................................................... socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd osmo_sock_init_osa() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 310 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index e6a6bd5..4441449 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -58,6 +58,11 @@ const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port, const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, unsigned int flags); +int osmo_sock_init_osa(uint16_t type, uint8_t proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + unsigned int flags); + int osmo_sock_init_ofd(struct osmo_fd *ofd, int family, int type, int proto, const char *host, uint16_t port, unsigned int flags); @@ -65,6 +70,11 @@ const char *local_host, uint16_t local_port, const char *remote_host, uint16_t remote_port, unsigned int flags); +int osmo_sock_init_osa_ofd(struct osmo_fd *ofd, int type, int proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + unsigned int flags); + int osmo_sock_init_sa(struct sockaddr *ss, uint16_t type, uint8_t proto, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 56f01dc..6c06063 100644 --- a/src/socket.c +++ b/src/socket.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -153,6 +154,28 @@ return sfd; } +static int socket_helper_osa(const struct osmo_sockaddr *addr, uint16_t type, uint8_t proto, unsigned int flags) +{ + int sfd, on = 1; + + sfd = socket(addr->u.sa.sa_family, type, proto); + if (sfd == -1) { + LOGP(DLGLOBAL, LOGL_ERROR, + "unable to create socket: %s\n", strerror(errno)); + return sfd; + } + if (flags & OSMO_SOCK_F_NONBLOCK) { + if (ioctl(sfd, FIONBIO, (unsigned char *)&on) < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot set this socket unblocking: %s\n", + strerror(errno)); + close(sfd); + sfd = -EINVAL; + } + } + return sfd; +} + #ifdef HAVE_LIBSCTP /* Fill buf with a string representation of the address set, in the form: * buf_len == 0: "()" @@ -434,6 +457,135 @@ return sfd; } +#define _SOCKADDR_TO_STR(dest, sockaddr) do { \ + if (osmo_sockaddr_str_from_sockaddr(&dest, &sockaddr->u.sas)) \ + osmo_strlcpy(dest.ip, "Invalid IP", 11); \ + } while (0) + +/*! Initialize a socket (including bind and/or connect) + * \param[in] family Address Family like AF_INET, AF_INET6, AF_UNSPEC + * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM + * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP + * \param[in] local local address + * \param[in] remote remote address + * \param[in] flags flags like \ref OSMO_SOCK_F_CONNECT + * \returns socket file descriptor on success; negative on error + * + * This function creates a new socket of the + * \a type and \a proto and optionally binds it to the \a local + * as well as optionally connects it to the \a remote + * depending on the value * of \a flags parameter. + * + * As opposed to \ref osmo_sock_init(), this function allows to combine + * the \ref OSMO_SOCK_F_BIND and \ref OSMO_SOCK_F_CONNECT flags. This + * is useful if you want to connect to a remote host/port, but still + * want to bind that socket to either a specific local alias IP and/or a + * specific local source port. + * + * You must specify either \ref OSMO_SOCK_F_BIND, or \ref + * OSMO_SOCK_F_CONNECT, or both. + * + * If \ref OSMO_SOCK_F_NONBLOCK is specified, the socket will be set to + * non-blocking mode. + */ +int osmo_sock_init_osa(uint16_t type, uint8_t proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + unsigned int flags) +{ + int sfd = -1, rc, on = 1; + struct osmo_sockaddr_str sastr = {}; + + if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == 0) { + LOGP(DLGLOBAL, LOGL_ERROR, "invalid: you have to specify either " + "BIND or CONNECT flags\n"); + return -EINVAL; + } + + if ((flags & OSMO_SOCK_F_BIND) && !local) { + LOGP(DLGLOBAL, LOGL_ERROR, "invalid argument. Cannot BIND when local is NULL\n"); + return -EINVAL; + } + + if ((flags & OSMO_SOCK_F_CONNECT) && !remote) { + LOGP(DLGLOBAL, LOGL_ERROR, "invalid argument. Cannot CONNECT when remote is NULL\n"); + return -EINVAL; + } + + if ((flags & OSMO_SOCK_F_BIND) && + (flags & OSMO_SOCK_F_CONNECT) && + local->u.sa.sa_family != remote->u.sa.sa_family) { + LOGP(DLGLOBAL, LOGL_ERROR, "invalid: the family for " + "local and remote endpoint must be same.\n"); + return -EINVAL; + } + + /* figure out local side of socket */ + if (flags & OSMO_SOCK_F_BIND) { + sfd = socket_helper_osa(local, type, proto, flags); + if (sfd < 0) { + _SOCKADDR_TO_STR(sastr, local); + LOGP(DLGLOBAL, LOGL_ERROR, "no suitable local addr found for: %s:%u\n", + sastr.ip, sastr.port); + return -ENODEV; + } + + if (proto != IPPROTO_UDP || (flags & OSMO_SOCK_F_UDP_REUSEADDR)) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); + if (rc < 0) { + _SOCKADDR_TO_STR(sastr, local); + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket:" + " %s:%u: %s\n", + sastr.ip, sastr.port, + strerror(errno)); + close(sfd); + return rc; + } + } + + if (bind(sfd, &local->u.sa, sizeof(struct osmo_sockaddr)) == -1) { + _SOCKADDR_TO_STR(sastr, local); + LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: %s:%u: %s\n", + sastr.ip, sastr.port, strerror(errno)); + close(sfd); + return -1; + } + } + + /* Reached this point, if OSMO_SOCK_F_BIND then sfd is valid (>=0) or it + was already closed and func returned. If OSMO_SOCK_F_BIND is not + set, then sfd = -1 */ + + /* figure out remote side of socket */ + if (flags & OSMO_SOCK_F_CONNECT) { + if (sfd < 0) { + sfd = socket_helper_osa(remote, type, proto, flags); + if (sfd < 0) { + return sfd; + } + } + + rc = connect(sfd, &remote->u.sa, sizeof(struct osmo_sockaddr)); + if (rc != 0 && errno != EINPROGRESS) { + _SOCKADDR_TO_STR(sastr, remote); + LOGP(DLGLOBAL, LOGL_ERROR, "unable to connect socket: %s:%u: %s\n", + sastr.ip, sastr.port, strerror(errno)); + close(sfd); + return rc; + } + } + + rc = osmo_sock_init_tail(sfd, type, flags); + if (rc < 0) { + close(sfd); + sfd = -1; + } + + return sfd; +} + #ifdef HAVE_LIBSCTP /* Check whether there's an IPv6 Addr as first option of any addrinfo item in the addrinfo set */ @@ -860,6 +1012,13 @@ local_port, remote_host, remote_port, flags)); } +int osmo_sock_init_osa_ofd(struct osmo_fd *ofd, int type, int proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, unsigned int flags) +{ + return osmo_fd_init_ofd(ofd, osmo_sock_init_osa(type, proto, local, remote, flags)); +} + /*! Initialize a socket and fill \ref sockaddr * \param[out] ss socket address (will be filled in) * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 64e48bc..671177f 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -186,6 +186,133 @@ return 0; } +static int test_sockinit_osa(void) +{ + int fd, rc; + char *name; + + struct osmo_sockaddr localhost4 = {}; + struct osmo_sockaddr localhost6 = {}; + struct osmo_sockaddr localhost4_noport = {}; + struct osmo_sockaddr localhost6_noport = {}; + struct osmo_sockaddr any4 = {}; + struct osmo_sockaddr any6 = {}; + struct osmo_sockaddr invalid = {}; + + localhost4.u.sin = (struct sockaddr_in){ + .sin_family = AF_INET, + .sin_addr.s_addr = inet_addr("127.0.0.1"), + .sin_port = htons(42), + }; + + localhost6.u.sin6 = (struct sockaddr_in6){ + .sin6_family = AF_INET6, + .sin6_port = htons(42), + }; + inet_pton(AF_INET6, "::1", &localhost6.u.sin6.sin6_addr); + + localhost4_noport = localhost4; + localhost4_noport.u.sin.sin_port = htons(0); + localhost6_noport = localhost6; + localhost6_noport.u.sin6.sin6_port = htons(0); + + any4.u.sin = (struct sockaddr_in){ + .sin_family = AF_INET, + .sin_addr.s_addr = inet_addr("0.0.0.0"), + .sin_port = htons(0), + }; + any6.u.sin6 = (struct sockaddr_in6){ + .sin6_family = AF_INET6, + .sin6_port = htons(0), + }; + inet_pton(AF_INET6, "::", &any6.u.sin6.sin6_addr); + + invalid.u.sa.sa_family = AF_UNSPEC; + + printf("Checking osmo_sock_init_osa() with bind to a random local UDP port\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, + &any4, NULL, OSMO_SOCK_F_BIND); + OSMO_ASSERT(fd >= 0); + name = osmo_sock_get_name(ctx, fd); + /* expect it to be not connected. We cannot match on INADDR_ANY, + * as apparently that won't work on FreeBSD if there's only one + * address (e.g. 137.0.0.1) assigned to the entire system, like + * the Osmocom FreeBSD build slaves */ + OSMO_ASSERT(!strncmp(name, "(r=NULL<->", 9)); + talloc_free(name); + /* expect it to be blocking */ + rc = fcntl(fd, F_GETFL); + OSMO_ASSERT(!(rc & O_NONBLOCK)); + close(fd); + + printf("Checking osmo_sock_init_osa() IPv4 for OSMO_SOCK_F_NONBLOCK\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, + &any4, NULL, OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK); + OSMO_ASSERT(fd >= 0); + /* expect it to be blocking */ + rc = fcntl(fd, F_GETFL); + OSMO_ASSERT(rc & O_NONBLOCK); + close(fd); + + printf("Checking osmo_sock_init_osa() IPv6 for OSMO_SOCK_F_NONBLOCK\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, + &any6, NULL, OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK); + OSMO_ASSERT(fd >= 0); + /* expect it to be blocking */ + rc = fcntl(fd, F_GETFL); + OSMO_ASSERT(rc & O_NONBLOCK); + close(fd); + + printf("Checking osmo_sock_init_osa() for invalid flags\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, &any4, NULL, 0); + OSMO_ASSERT(fd < 0); + + printf("Checking osmo_sock_init_osa() for combined BIND + CONNECT on IPv4\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, &localhost4_noport, &localhost4, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd >= 0); + name = osmo_sock_get_name(ctx, fd); +#ifndef __FreeBSD__ + /* For some reason, on the jenkins.osmocom.org build slave with + * FreeBSD 10 inside a jail, it fails. Works fine on laforge's + * FreeBSD 10 or 11 VM at home */ + OSMO_ASSERT(!strncmp(name, "(r=127.0.0.1:42<->l=127.0.0.1", 29)); +#endif + close(fd); + + printf("Checking osmo_sock_init_osa() for combined BIND + CONNECT on IPv6\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, &localhost6_noport, &localhost6, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd >= 0); + name = osmo_sock_get_name(ctx, fd); +#ifndef __FreeBSD__ + /* For some reason, on the jenkins.osmocom.org build slave with + * FreeBSD 10 inside a jail, it fails. Works fine on laforge's + * FreeBSD 10 or 11 VM at home */ + OSMO_ASSERT(!strncmp(name, "(r=::1:42<->l=::1", 17)); +#endif + close(fd); + + printf("Checking osmo_sock_init_osa() must fail on mixed IPv4 & IPv6\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, &localhost4_noport, &localhost6, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd < 0); + + printf("Checking osmo_sock_init_osa() must fail on mixed IPv6 & IPv4\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, &localhost6_noport, &localhost4, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd < 0); + + printf("Checking osmo_sock_init_osa() must fail on invalid osmo_sockaddr\n"); + fd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, &invalid, &localhost4, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd < 0); + + talloc_free(name); + + return 0; +} + const struct log_info_cat default_categories[] = { }; @@ -204,6 +331,7 @@ test_sockinit(); test_sockinit2(); test_get_ip_and_port(); + test_sockinit_osa(); return EXIT_SUCCESS; } diff --git a/tests/socket/socket_test.err b/tests/socket/socket_test.err index 0f0f8da..3c198ac 100644 --- a/tests/socket/socket_test.err +++ b/tests/socket/socket_test.err @@ -2,3 +2,7 @@ invalid: you have to specify either BIND or CONNECT flags Unable to find a common protocol (IPv4 or IPv6) for local host: 127.0.0.1 and remote host: ::1. Unable to find a common protocol (IPv4 or IPv6) for local host: ::1 and remote host: 127.0.0.1. +invalid: you have to specify either BIND or CONNECT flags +invalid: the family for local and remote endpoint must be same. +invalid: the family for local and remote endpoint must be same. +invalid: the family for local and remote endpoint must be same. diff --git a/tests/socket/socket_test.ok b/tests/socket/socket_test.ok index 589036f..9a52d44 100644 --- a/tests/socket/socket_test.ok +++ b/tests/socket/socket_test.ok @@ -12,3 +12,12 @@ Checking osmo_sock_init2(AF_UNSPEC) BIND on IPv4 Checking test_get_ip_and_port() for combined BIND + CONNECT on IPv4 Checking test_get_ip_and_port() for combined BIND + CONNECT on IPv6 +Checking osmo_sock_init_osa() with bind to a random local UDP port +Checking osmo_sock_init_osa() IPv4 for OSMO_SOCK_F_NONBLOCK +Checking osmo_sock_init_osa() IPv6 for OSMO_SOCK_F_NONBLOCK +Checking osmo_sock_init_osa() for invalid flags +Checking osmo_sock_init_osa() for combined BIND + CONNECT on IPv4 +Checking osmo_sock_init_osa() for combined BIND + CONNECT on IPv6 +Checking osmo_sock_init_osa() must fail on mixed IPv4 & IPv6 +Checking osmo_sock_init_osa() must fail on mixed IPv6 & IPv4 +Checking osmo_sock_init_osa() must fail on invalid osmo_sockaddr -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 19:49:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 19:49:10 +0000 Subject: Change in libosmocore[master]: socket: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket: add osmo_sockaddr_cmp() ...................................................................... socket: add osmo_sockaddr_cmp() Compare two osmo_sockaddr. Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 4441449..e417f42 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -113,5 +113,7 @@ int osmo_sock_local_ip(char *local_ip, const char *remote_ip); +int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b); + #endif /* (!EMBEDDED) */ /*! @} */ diff --git a/src/socket.c b/src/socket.c index 6c06063..803af31 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1662,6 +1662,35 @@ return 0; } +/*! Compare two osmo_sockaddr. + * \param[in] a + * \param[in] b + * \return 0 if a and b are equal. Otherwise it follows memcmp() + */ +int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b) +{ + if (a == b) + return 0; + if (!a) + return 1; + if (!b) + return -1; + + if (a->u.sa.sa_family != b->u.sa.sa_family) { + return OSMO_CMP(a->u.sa.sa_family, b->u.sa.sa_family); + } + + switch (a->u.sa.sa_family) { + case AF_INET: + return memcmp(&a->u.sin, &b->u.sin, sizeof(struct sockaddr_in)); + case AF_INET6: + return memcmp(&a->u.sin6, &b->u.sin6, sizeof(struct sockaddr_in6)); + default: + /* fallback to memcmp for remaining AF over the full osmo_sockaddr length */ + return memcmp(a, b, sizeof(struct osmo_sockaddr)); + } +} + #endif /* HAVE_SYS_SOCKET_H */ /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 19:50:59 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 19:50:59 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgp: remove superfluous whitespace In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19999 to look at the new patch set (#2). Change subject: gb/gprs_bssgp: remove superfluous whitespace ...................................................................... gb/gprs_bssgp: remove superfluous whitespace Change-Id: Ic66f7e640cd473fa2c8473a3e91f57332ae9bf6a --- M src/gb/gprs_bssgp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/19999/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic66f7e640cd473fa2c8473a3e91f57332ae9bf6a Gerrit-Change-Number: 19999 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 19:50:59 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 19:50:59 +0000 Subject: Change in libosmocore[master]: gb/common_vty: use void * In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20000 to look at the new patch set (#2). Change subject: gb/common_vty: use void * ...................................................................... gb/common_vty: use void * As long the filter doesn't look into the nsvc/bvc structs there is no need to use the type. Further it allows to use the same code for NS1 and NS2. Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac --- M src/gb/common_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/20000/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac Gerrit-Change-Number: 20000 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:25:50 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 20:25:50 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 to look at the new patch set (#2). Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a remote_proto to define the given protocol. IPPROTO is more universal than address_family and is defined by an RFC. IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or unused entry. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 20:32:28 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 to look at the new patch set (#2). Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a remote_proto to define the given protocol. IPPROTO is more universal than address_family and is defined by an RFC. IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or unused entry. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/19419/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:32:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 20:32:47 +0000 Subject: Change in libosmo-sccp[master]: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 ) Change subject: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07 Gerrit-Change-Number: 19984 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 20:32:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:51:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 20:51:39 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: fix misleading comment in header In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19985 ) Change subject: osmo-bts-trx/trx_provision_fsm: fix misleading comment in header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iff9f073ce65bc443109107bb895124ec38dbbb10 Gerrit-Change-Number: 19985 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 20:51:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:52:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 20:52:05 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19986 ) Change subject: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I56d2777bcc43c96b9fa1672d3ad29bf9817208bb Gerrit-Change-Number: 19986 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 20:52:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:52:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 20:52:38 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if: drop redundant logging message In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19987 ) Change subject: osmo-bts-trx/l1_if: drop redundant logging message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3d4a4473541327488d3393b1fa7c6391afb3728a Gerrit-Change-Number: 19987 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 20:52:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:55:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 20:55:28 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19988 ) Change subject: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8727460acbf850b84df67a9cbdc25b47dee1fadd Gerrit-Change-Number: 19988 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 20:55:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 20:56:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 20:56:29 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: add missing default labels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19989 ) Change subject: osmo-bts-trx/trx_provision_fsm: add missing default labels ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I494ea9eb64634a03575a52750273cee7c68a8b3a Gerrit-Change-Number: 19989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 20:56:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:00:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:00:02 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19788 ) Change subject: encoding: implement handing of hopping parameters ...................................................................... Patch Set 3: Code-Review+1 Fine with me as long as you do it sooner than later. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:00:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:06:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:06:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn at 2165 PS1, Line 2165: private function f_TC_pcuif_fh_params_gen(integer ma_len) Why do you need a function here instead of a template? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:06:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:08:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:08:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add Mobile Allocation length field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 ) Change subject: library/PCUIF_Types: version 10: add Mobile Allocation length field ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991/1/pcu/PCU_Tests.ttcn at 2200 PS1, Line 2200: ma := substr(ts.ma, 0, ma_oct_len * 8) Aren'y you creating a substr bigger than the original ts.ma here? is this allowed? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Gerrit-Change-Number: 19991 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:08:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:10:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:10:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 ) Change subject: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Gerrit-Change-Number: 19993 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:10:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:11:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:11:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_handover_cmd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 ) Change subject: BSC_Tests/hopping: add TC_fh_params_handover_cmd ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Gerrit-Change-Number: 19943 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:11:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:11:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:11:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 ) Change subject: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 Gerrit-Change-Number: 19994 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:11:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:13:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:13:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 ) Change subject: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia79efc9aa07b5088913d6679715f351d30f48d13 Gerrit-Change-Number: 19995 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:13:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:16:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:16:16 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19997 ) Change subject: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I119f930e9cb5d6e52d4b0e1160604c709d942a18 Gerrit-Change-Number: 19997 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:16:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:16:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:16:53 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19998 ) Change subject: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I264a66a1405e72940a79e9e20ad6ad8f269a7bbc Gerrit-Change-Number: 19998 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:16:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:17:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:17:40 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgp: remove superfluous whitespace In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19999 ) Change subject: gb/gprs_bssgp: remove superfluous whitespace ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic66f7e640cd473fa2c8473a3e91f57332ae9bf6a Gerrit-Change-Number: 19999 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:17:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 21:18:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 6 Sep 2020 21:18:26 +0000 Subject: Change in libosmocore[master]: gb/common_vty: use void * In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20000 ) Change subject: gb/common_vty: use void * ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac Gerrit-Change-Number: 20000 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 06 Sep 2020 21:18:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 23:44:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 23:44:02 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgp: remove superfluous whitespace In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19999 ) Change subject: gb/gprs_bssgp: remove superfluous whitespace ...................................................................... gb/gprs_bssgp: remove superfluous whitespace Change-Id: Ic66f7e640cd473fa2c8473a3e91f57332ae9bf6a --- M src/gb/gprs_bssgp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index fa4e187..9c119fb 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -73,7 +73,7 @@ uint32_t llc_pdu_len, void *priv); -/* callback to be backward compatible with old users which do not set the bssgp_ns_send function */ +/* callback to be backward compatible with old users which do not set the bssgp_ns_send function */ static int _gprs_ns_sendmsg(void *ctx, struct msgb *msg) { return gprs_ns_sendmsg(bssgp_nsi, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic66f7e640cd473fa2c8473a3e91f57332ae9bf6a Gerrit-Change-Number: 19999 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 23:48:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 23:48:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 ) Change subject: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE ...................................................................... PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE The ALIVE PDU does not have to be sent before an UNBLOCK message. Ignore UNBLOCK messages in cases a single ALIVE is expected. According to TS 48.016 v5.2.0, 7.4: "Upon successful completion of an NS-VC reset procedure, a BSS (or SGSN) shall start timer Tns-test, then [..]" The ALIVE should arive Tns-test after the reset procedure (typ. 1s-60s). Change-Id: I11d77b7477981998082967e5123b61636af2b980 --- M pcu/PCU_Tests_NS.ttcn 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/20001/1 diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index b1c8f38..b6ed723 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -295,9 +295,11 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); + alt { /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - setverdict(pass); + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { setverdict(pass); }; + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; } + } } /* Test for NS-RESET after NS-ALIVE timeout */ @@ -309,12 +311,16 @@ as_rx_ns_reset_ack(oneshot := true); /* wait for at least one NS-ALIVE */ - NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)); + alt { + [] as_rx_alive_tx_ack(oneshot := true) { }; + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; } + } /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */ alt { [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); } [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; } + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; } } } @@ -326,8 +332,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); as_rx_ns_unblock_ack(oneshot := true); @@ -342,8 +347,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); /* wait for first NS-UNBLOCK, don't respond */ @@ -362,8 +366,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); as_rx_ns_unblock_ack(oneshot := true); @@ -389,8 +392,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); as_rx_ns_unblock_ack(oneshot := true); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I11d77b7477981998082967e5123b61636af2b980 Gerrit-Change-Number: 20001 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 6 23:48:06 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 6 Sep 2020 23:48:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: add missing bound of nrf References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 ) Change subject: PCU_Tests_NS: add missing bound of nrf ...................................................................... PCU_Tests_NS: add missing bound of nrf Otherwise it will try to use setverdict() with an unbound PDU Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 --- M pcu/PCU_Tests_NS.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/20002/1 diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index b6ed723..ad670f1 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -107,7 +107,7 @@ log("f_ns_exp() expecting ", exp_rx); alt { [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } - [] NSCP[idx].receive { + [] NSCP[idx].receive(t_NS_RecvFrom(?)) -> value nrf { setverdict(fail, "Received unexpected NS: ", nrf); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 Gerrit-Change-Number: 20002 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 00:08:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 00:08:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: support IPv6 NSVC addr In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 ) Change subject: library/PCUIF_Types: version 10: support IPv6 NSVC addr ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Gerrit-Change-Number: 19420 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 00:08:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 00:14:31 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 00:14:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: verify NSVC IPv4/IPv6 in the INFO.ind message In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421 ) Change subject: BTS_Tests: verify NSVC IPv4/IPv6 in the INFO.ind message ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 Gerrit-Change-Number: 19421 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 00:14:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 00:21:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 00:21:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: support IPv6 NSVC addr In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 to look at the new patch set (#6). Change subject: library/PCUIF_Types: version 10: support IPv6 NSVC addr ...................................................................... library/PCUIF_Types: version 10: support IPv6 NSVC addr Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Tweaked-By: Vadim Yanitskiy Related: SYS#4915 --- M library/NS_Emulation.ttcn M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn M pcu/SGSN_Components.ttcn 4 files changed, 58 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/19420/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Gerrit-Change-Number: 19420 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 00:21:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 00:21:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: add IPv6 support for SNS References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 ) Change subject: PCU: add IPv6 support for SNS ...................................................................... PCU: add IPv6 support for SNS With PCUIF 10 the remote can be IPv4 or IPv6. Add all missing parts including SNS IPv6 elements, the support to omit IPv4 elements and a PCU_Tests_SNSv6.cfg configuration to run all tests with IPv6 Change-Id: I43d64caca600fff78f3fbbb3e8179f447f235d46 --- M library/NS_Emulation.ttcn M library/Osmocom_Gb_Types.ttcn M pcu/PCU_Tests_SNS.ttcn A pcu/PCU_Tests_SNSv6.cfg 4 files changed, 183 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/20003/1 diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 6f9bc39..ebacac1 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -232,7 +232,7 @@ setverdict(fail, "SNS-SIZE from unexpected NSEI"); self.stop; } - [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, true, + [config.remote_proto == PCUIF_ADDR_TYPE_IPV4] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, true, {tr_SNS_IPv4(config.remote_ip, config.remote_udp_port)}))) -> value rf { /* blindly acknowledge whatever the PCU sends */ NSCP.send(t_NS_Send(g_conn_id, ts_SNS_CONFIG_ACK(config.nsei, omit))); @@ -249,6 +249,23 @@ } } } + [config.remote_proto == PCUIF_ADDR_TYPE_IPV6] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, true, omit, + {tr_SNS_IPv6(config.remote_ip, config.remote_udp_port)}))) -> value rf { + /* blindly acknowledge whatever the PCU sends */ + NSCP.send(t_NS_Send(g_conn_id, ts_SNS_CONFIG_ACK(config.nsei, omit))); + /* send a SNS-CONFIG in response and expect a SNS-CONFIG-ACK */ + var IP6_Elements v6 := { valueof(ts_SNS_IPv6(config.local_ip, config.local_udp_port)) }; + NSCP.send(t_NS_Send(g_conn_id, ts_SNS_CONFIG(config.nsei, true, omit, v6))); + alt { + [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG_ACK(config.nsei, omit))) { + /* success */ + } + [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG_ACK(config.nsei, ?))) { + setverdict(fail, "Unexpected SNS-CONFIG-NACK"); + self.stop; + } + } + } [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, false, ?))) { /* ignore */} [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, true, ?))) { setverdict(fail, "Unexpected SNS-CONFIG content"); diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 3aeba8f..a2b9499 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -230,6 +230,40 @@ return e; } + template (value) IP6_Element ts_SNS_IPv6(charstring ip, integer udp_port, + uint8_t sig_weight := 1, uint8_t data_weight := 1) := { + ipAddress := f_inet6_addr(ip), + uDP_Port := int2oct(udp_port, 2), + signallingWeight := int2oct(sig_weight, 1), + dataWeight := int2oct(data_weight, 1) + } + function tr_SNS_IPv6(template charstring ip, template integer udp_port, + template uint8_t sig_weight := ?, template uint8_t data_weight := ?) + return template IP6_Element { + var template IP6_Element e; + if (istemplatekind(ip, "?")) { + e.ipAddress := ?; + } else { + e.ipAddress := f_inet6_addr(valueof(ip)); + } + if (istemplatekind(udp_port, "?")) { + e.uDP_Port := ?; + } else { + e.uDP_Port := int2oct(valueof(udp_port), 2); + } + if (istemplatekind(sig_weight, "?")) { + e.signallingWeight := ?; + } else { + e.signallingWeight := int2oct(valueof(sig_weight), 1); + } + if (istemplatekind(data_weight, "?")) { + e.dataWeight := ?; + } else { + e.dataWeight := int2oct(valueof(data_weight), 1); + } + return e; + } + template (value) PDU_NS ts_NS_RESET(NsCause cause, Nsvci nsvci, Nsei nsei) := { pDU_NS_Reset := { @@ -526,7 +560,7 @@ } template (value) PDU_NS ts_SNS_CONFIG(Nsei nsei, boolean end_flag, - template (omit) IP4_Elements v4, + template (omit) IP4_Elements v4 := omit, template (omit) IP6_Elements v6 := omit) := { pDU_SNS_Config := { nsPduType := '0F'O, @@ -537,7 +571,7 @@ } } template PDU_NS tr_SNS_CONFIG(template Nsei nsei, template boolean end_flag, - template IP4_Elements v4, + template IP4_Elements v4 := omit, template IP6_Elements v6 := omit) := { pDU_SNS_Config := { nsPduType := '0F'O, diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index fc98979..957b56b 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -26,9 +26,16 @@ runs on RAW_NS_CT { log("f_incoming_sns_size(idx=", idx, ")"); var PDU_NS rx; - /* expect one single SNS-SIZE with RESET flag; one remote v4 EP; no v6 EP */ - rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 8, - num_v4 := 4, num_v6 := omit), idx); + + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + /* expect one single SNS-SIZE with RESET flag; one remote v4 EP; no v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 8, + num_v4 := 4, num_v6 := omit), idx); + } else { + /* expect one single SNS-SIZE with RESET flag; no v4 EP; one remote v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 8, + num_v4 := omit, num_v6 := 4), idx); + } NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_SIZE_ACK(g_nsconfig[idx].nsei, cause))); } @@ -37,9 +44,15 @@ runs on RAW_NS_CT { log("f_outgoing_sns_size(idx=", idx, ")"); var PDU_NS rx; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 1, - num_v4 := 1, num_v6 := omit) - )); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 1, + num_v4 := 1, num_v6 := omit) + )); + } else { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 1, + num_v4 := omit, num_v6 := 1) + )); + } /* expect one single SNS-SIZE with RESET flag; one remote v4 EP; no v6 EP */ rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig[idx].nsei, cause), idx); } @@ -49,9 +62,16 @@ runs on RAW_NS_CT { log("f_incoming_sns_config(idx=", idx, ")"); var PDU_NS rx; - var template IP4_Elements v4_elem := { tr_SNS_IPv4(mp_nsconfig.remote_ip, - mp_nsconfig.remote_udp_port) }; - rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v4 := v4_elem), idx); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + var template IP4_Elements v4_elem := { tr_SNS_IPv4(mp_nsconfig.remote_ip, + mp_nsconfig.remote_udp_port) }; + rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v4 := v4_elem), idx); + } else { + var template IP6_Elements v6_elem := { tr_SNS_IPv6(mp_nsconfig.remote_ip, + mp_nsconfig.remote_udp_port) }; + rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v6 := v6_elem), idx); + } + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause))); } @@ -60,9 +80,15 @@ runs on RAW_NS_CT { log("f_outgoing_sns_config(idx=", idx, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx].local_ip, - g_nsconfig[idx].local_udp_port) } - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx].local_ip, + g_nsconfig[idx].local_udp_port) } + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[idx].local_ip, + g_nsconfig[idx].local_udp_port) } + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, omit, v6))); + } rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx); } @@ -71,11 +97,19 @@ runs on RAW_NS_CT { log("f_outgoing_sns_config_1c1u(idx=", idx, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].local_ip, - g_nsconfig[0].local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig[1].local_ip, - g_nsconfig[1].local_udp_port, 0, 1) }; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].local_ip, + g_nsconfig[0].local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig[1].local_ip, + g_nsconfig[1].local_udp_port, 0, 1) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[0].local_ip, + g_nsconfig[0].local_udp_port, 1, 0), + ts_SNS_IPv6(g_nsconfig[1].local_ip, + g_nsconfig[1].local_udp_port, 0, 1) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, omit, v6))); + } rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx); } @@ -84,11 +118,19 @@ runs on RAW_NS_CT { log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[1].local_ip, - g_nsconfig[1].local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig[2].local_ip, - g_nsconfig[2].local_udp_port, 0, 1) }; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[1].local_ip, + g_nsconfig[1].local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig[2].local_ip, + g_nsconfig[2].local_udp_port, 0, 1) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[1].local_ip, + g_nsconfig[1].local_udp_port, 1, 0), + ts_SNS_IPv6(g_nsconfig[2].local_ip, + g_nsconfig[2].local_udp_port, 0, 1) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, omit, v6))); + } rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx); } @@ -96,33 +138,57 @@ runs on RAW_NS_CT { log("f_outgoing_sns_add(idx_add=", idx_add, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_add].local_ip, - g_nsconfig[idx_add].local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_ADD(g_nsconfig[idx].nsei, 23, v4))); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, omit, v4)); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_add].local_ip, + g_nsconfig[idx_add].local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_ADD(g_nsconfig[idx].nsei, 23, v4))); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, omit, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[idx_add].local_ip, + g_nsconfig[idx_add].local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_ADD(g_nsconfig[idx].nsei, 23, omit, v6))); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, omit, omit, v6)); + } } function f_outgoing_sns_del(integer idx_del, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0) runs on RAW_NS_CT { log("f_outgoing_sns_del(idx_del=", idx_del, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_del].local_ip, - g_nsconfig[idx_del].local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_DEL(g_nsconfig[idx].nsei, 24, omit, v4))); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 24, omit, v4)); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_del].local_ip, + g_nsconfig[idx_del].local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_DEL(g_nsconfig[idx].nsei, 24, omit, v4))); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 24, omit, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[idx_del].local_ip, + g_nsconfig[idx_del].local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_DEL(g_nsconfig[idx].nsei, 24, omit, omit, v6))); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 24, omit, omit, v6)); + } } function f_outgoing_sns_chg_weight(integer idx_chg, uint8_t w_sig, uint8_t w_user, integer idx := 0) runs on RAW_NS_CT { log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_chg].local_ip, - g_nsconfig[idx_chg].local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CHG_WEIGHT(g_nsconfig[idx].nsei, 25, v4))); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 25, omit, v4)); + if (mp_nsconfig.remote_proto == PCUIF_ADDR_TYPE_IPV4) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_chg].local_ip, + g_nsconfig[idx_chg].local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CHG_WEIGHT(g_nsconfig[idx].nsei, 25, v4))); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 25, omit, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[idx_chg].local_ip, + g_nsconfig[idx_chg].local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CHG_WEIGHT(g_nsconfig[idx].nsei, 25, omit, v6))); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 25, omit, omit, v6)); + } } diff --git a/pcu/PCU_Tests_SNSv6.cfg b/pcu/PCU_Tests_SNSv6.cfg new file mode 100644 index 0000000..b50dacc --- /dev/null +++ b/pcu/PCU_Tests_SNSv6.cfg @@ -0,0 +1,26 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./PCU_Tests.default" + +[LOGGING] + +[MODULE_PARAMETERS] +SGSN_Components.mp_nsconfig := { + remote_proto == PCUIF_ADDR_TYPE_IPV6, + local_ip := "::1", + local_udp_port := 23000, + remote_ip := "::1", + remote_udp_port := 22000, + nsvci := 1234, + nsei := 1234 +} +PCUIF_Types.mp_pcuif_version := 10 + +[TESTPORT_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +PCU_Tests_SNS.control -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I43d64caca600fff78f3fbbb3e8179f447f235d46 Gerrit-Change-Number: 20003 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 00:59:06 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 00:59:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: support IPv6 NSVC addr In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 to look at the new patch set (#7). Change subject: library/PCUIF_Types: version 10: support IPv6 NSVC addr ...................................................................... library/PCUIF_Types: version 10: support IPv6 NSVC addr Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Tweaked-By: Vadim Yanitskiy Related: SYS#4915 --- M library/NS_Emulation.ttcn M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn M pcu/SGSN_Components.ttcn M sgsn/gen_links.sh 5 files changed, 59 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/19420/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Gerrit-Change-Number: 19420 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Sep 7 01:40:59 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 07 Sep 2020 01:40:59 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f558fafaf31_12d02af35bf545f012725de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 272s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 273s] [COMPILING libboard/qmod/source/card_pres.c] [ 273s] [COMPILING libboard/qmod/source/wwan_led.c] [ 273s] [COMPILING libboard/qmod/source/i2c.c] [ 273s] [COMPILING libboard/qmod/source/board_qmod.c] [ 273s] [COMPILING apps/dfu/main.c] [ 274s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 274s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 274s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 274s] Memory region Used Size Region Size %age Used [ 274s] rom: 16588 B 16 KB 101.25% [ 274s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 274s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 274s] collect2: error: ld returned 1 exit status [ 274s] % [ 274s] make[2]: *** [Makefile:234: flash] Error 1 [ 274s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 274s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 274s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 274s] dh_auto_build: error: make -j1 returned exit code 2 [ 274s] make: *** [debian/rules:16: build] Error 25 [ 274s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 274s] ### VM INTERACTION START ### [ 278s] [ 254.421739] sysrq: Power Off [ 278s] [ 254.436383] reboot: Power down [ 278s] ### VM INTERACTION END ### [ 278s] [ 278s] lamb01 failed "build simtrace2_0.7.0.63.39070.dsc" at Mon Sep 7 01:40:57 UTC 2020. [ 278s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:01:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:01:03 +0000 Subject: Change in osmo-pcu[master]: TODO: encoding: encode hopping params once, cache and reuse them References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20004 ) Change subject: TODO: encoding: encode hopping params once, cache and reuse them ...................................................................... TODO: encoding: encode hopping params once, cache and reuse them Change-Id: Ib08171a83ffab565d5ebb393c1c42317d7d14251 --- M src/encoding.cpp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/04/20004/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 8257498..8e1413e 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -571,6 +571,8 @@ return; } + /* TODO: encode Direct_encoding_1_t once, cache, and reuse here */ + /* Direct encoding 1 (see Table 12.8.1) */ freq_params->UnionType = 0x2; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib08171a83ffab565d5ebb393c1c42317d7d14251 Gerrit-Change-Number: 20004 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:01:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:01:58 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19788 ) Change subject: encoding: implement handing of hopping parameters ...................................................................... Patch Set 3: > Patch Set 3: Code-Review+1 > > Fine with me as long as you do it sooner than later. This way I won't forget to do that: https://gerrit.osmocom.org/c/osmo-pcu/+/20004 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 04:01:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:06:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:06:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn at 2165 PS1, Line 2165: private function f_TC_pcuif_fh_params_gen(integer ma_len) > Why do you need a function here instead of a template? Right, we don't really need a wrapper function here. Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 04:06:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:08:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:08:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add Mobile Allocation length field In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 ) Change subject: library/PCUIF_Types: version 10: add Mobile Allocation length field ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991/1/pcu/PCU_Tests.ttcn at 2200 PS1, Line 2200: ma := substr(ts.ma, 0, ma_oct_len * 8) > Aren'y you creating a substr bigger than the original ts. [?] ts.ma is always 64 bit long, since ts_PCUIF_InfoTrxTsH1() pads it for us. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Gerrit-Change-Number: 19991 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 04:08:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:13:04 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 04:13:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: move RAW_NS into own file to use it in the SGSN tests References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20005 ) Change subject: PCU: move RAW_NS into own file to use it in the SGSN tests ...................................................................... PCU: move RAW_NS into own file to use it in the SGSN tests In preparation to test the SGSN role of NS Change-Id: Id91aa81c4fb6689cd1353d88b4806d26868769e8 --- M pcu/PCU_Tests_NS.ttcn M pcu/PCU_Tests_SNS.ttcn A pcu/RAW_NS.ttcn 3 files changed, 215 insertions(+), 187 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/20005/1 diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index b1c8f38..ce2560f 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -26,14 +26,7 @@ import from IPL4asp_Types all; import from PCUIF_Types all; import from PCUIF_CodecPort all; - -type component RAW_NS_CT { - /* UDP port towards the bottom (IUT) */ - port NS_CODEC_PT NSCP[4]; - var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; - var NSConfiguration g_nsconfig[4]; - timer g_T_guard; -} +import from RAW_NS all; type component RAW_PCU_CT { /* PCUIF (we emulate the BTS part) */ @@ -44,13 +37,6 @@ type component RAW_Test_CT extends RAW_NS_CT, RAW_PCU_CT { } -private altstep as_Tguard() runs on RAW_NS_CT { - [] g_T_guard.timeout { - setverdict(fail, "Timeout of T_guard"); - mtc.stop; - } -} - function f_init_pcuif() runs on RAW_PCU_CT { var PCUIF_info_ind info_ind; map(self:PCU, system:PCU); @@ -73,73 +59,6 @@ PCU.send(t_SD_PCUIF(g_pcu_conn_id, msg)); } -function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { - var Result res; - - if (not g_T_guard.running) { - g_T_guard.start(guard_secs); - activate(as_Tguard()); - } - - if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { - /* copy most parts from mp_nsconfig */ - g_nsconfig[idx] := mp_nsconfig; - /* adjust those parts different for each NS-VC */ - g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; - g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; - } - - map(self:NSCP[idx], system:NSCP); - /* Connect the UDP socket */ - log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); - res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, - g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); - if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); - mtc.stop; - } - g_ns_conn_id[idx] := res.connId; - -} - -function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { - var NS_RecvFrom nrf; - log("f_ns_exp() expecting ", exp_rx); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } - [] NSCP[idx].receive { - setverdict(fail, "Received unexpected NS: ", nrf); - mtc.stop; - } - } - return nrf.msg; -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); - [] NSCP[idx].receive { repeat; } - } -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { - timer T := tout; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - T.start; - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { - setverdict(fail, "Received unexpected NS-ALIVE ACK"); - } - [] NSCP[idx].receive { repeat; } - [] T.timeout { - setverdict(pass); - } - } -} - /* ensure no matching message is received within 'tout' */ function f_ensure_no_ns(template PDU_NS ns := ?, integer idx := 0, float tout := 3.0) runs on RAW_Test_CT { @@ -155,111 +74,6 @@ } } -/* perform outbound NS-BLOCK procedure */ -function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); - [] NSCP[idx].receive { repeat; } - } -} - -/* receive NS-ALIVE and ACK it */ -altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); - if (not oneshot) { repeat; } - } -} - -/* Transmit BSSGP RESET for given BVCI and expect ACK */ -function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) -runs on RAW_NS_CT { - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, - mp_gb_cfg.cell_id)); - timer T := 5.0; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - T.start; - alt { - [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET_ACK(bvci, ?)))) { - setverdict(pass); - } - [exp_ack] T.timeout { - setverdict(fail, "No response to BVC-RESET"); - } - [not exp_ack] T.timeout { - setverdict(pass); - } - [] NSCP[idx].receive { repeat; } - } -} - -/* Receive a BSSGP RESET for given BVCI and ACK it */ -altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - /* FIXME: nail down received cell_id in match */ - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET(?, bvci, ?)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - - -/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ -altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch t_BVC_UNBLOCK(bvci)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ -altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, - decmatch tr_BVC_FC_BVC))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; - var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/********************************************************************************** - * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * - **********************************************************************************/ - -/* Receive a NS-RESET and ACK it */ -private altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))); - if (not oneshot) { repeat; } - } -} -/* Receive a NS-UNBLOCK and ACK it */ -private altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); - if (not oneshot) { repeat; } - } -} - /* test the NS-RESET procedure */ testcase TC_ns_reset() runs on RAW_Test_CT { f_init_ns_codec(); diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index fc98979..dd133a3 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -16,6 +16,7 @@ import from Osmocom_Gb_Types all; import from NS_CodecPort all; import from NS_Types all; +import from RAW_NS all; /********************************************************************************** * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn new file mode 100644 index 0000000..c04a3e2 --- /dev/null +++ b/pcu/RAW_NS.ttcn @@ -0,0 +1,213 @@ +module RAW_NS { + +/* Osmocom NS test suite for NS in TTCN-3 + * (C) 2018-2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from SGSN_Components all; +import from Osmocom_Gb_Types all; +import from NS_CodecPort all; +import from NS_Types all; +import from BSSGP_Types all; +import from NS_CodecPort all; +import from NS_CodecPort_CtrlFunct all; +import from NS_Emulation all; +import from Native_Functions all; +import from IPL4asp_Types all; + +public type component RAW_NS_CT { + /* UDP port towards the bottom (IUT) */ + port NS_CODEC_PT NSCP[4]; + var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; + var NSConfiguration g_nsconfig[4]; + timer g_T_guard; +} + +public altstep as_Tguard() runs on RAW_NS_CT { + [] g_T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + mtc.stop; + } +} + +function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { + var Result res; + + if (not g_T_guard.running) { + g_T_guard.start(guard_secs); + activate(as_Tguard()); + } + + if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { + /* copy most parts from mp_nsconfig */ + g_nsconfig[idx] := mp_nsconfig; + /* adjust those parts different for each NS-VC */ + g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; + g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; + } + + map(self:NSCP[idx], system:NSCP); + /* Connect the UDP socket */ + log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); + res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, + g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); + mtc.stop; + } + g_ns_conn_id[idx] := res.connId; + +} + +function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { + var NS_RecvFrom nrf; + log("f_ns_exp() expecting ", exp_rx); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } + [] NSCP[idx].receive { + setverdict(fail, "Received unexpected NS: ", nrf); + mtc.stop; + } + } + return nrf.msg; +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); + [] NSCP[idx].receive { repeat; } + } +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { + timer T := tout; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { + setverdict(fail, "Received unexpected NS-ALIVE ACK"); + } + [] NSCP[idx].receive { repeat; } + [] T.timeout { + setverdict(pass); + } + } +} + +/* perform outbound NS-BLOCK procedure */ +function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); + [] NSCP[idx].receive { repeat; } + } +} + +/* receive NS-ALIVE and ACK it */ +altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); + if (not oneshot) { repeat; } + } +} + +/* Transmit BSSGP RESET for given BVCI and expect ACK */ +function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) +runs on RAW_NS_CT { + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, + mp_gb_cfg.cell_id)); + timer T := 5.0; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + T.start; + alt { + [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET_ACK(bvci, ?)))) { + setverdict(pass); + } + [exp_ack] T.timeout { + setverdict(fail, "No response to BVC-RESET"); + } + [not exp_ack] T.timeout { + setverdict(pass); + } + [] NSCP[idx].receive { repeat; } + } +} + +/* Receive a BSSGP RESET for given BVCI and ACK it */ +altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + /* FIXME: nail down received cell_id in match */ + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET(?, bvci, ?)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + + +/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ +altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch t_BVC_UNBLOCK(bvci)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ +altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, + decmatch tr_BVC_FC_BVC))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; + var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/********************************************************************************** + * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * + **********************************************************************************/ + +/* Receive a NS-RESET and ACK it */ +public altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))); + if (not oneshot) { repeat; } + } +} +/* Receive a NS-UNBLOCK and ACK it */ +public altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); + if (not oneshot) { repeat; } + } +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id91aa81c4fb6689cd1353d88b4806d26868769e8 Gerrit-Change-Number: 20005 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:13:04 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 04:13:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: add a simple tr_NS_STATUS() References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20006 ) Change subject: Osmocom_Gb_Types: add a simple tr_NS_STATUS() ...................................................................... Osmocom_Gb_Types: add a simple tr_NS_STATUS() Change-Id: I0de6c483361a00a924a278a77151253450a0c1a2 --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/20006/1 diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 3aeba8f..7ddaada 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -334,6 +334,18 @@ } } + template PDU_NS tr_NS_STATUS(template NsCause cause) := { + pDU_NS_Status := { + nsPduType := '08'O, + causeNS := tr_NS_IE_CAUSE(cause), + nS_VCI := *, + nS_PDU := *, + bVCI_NS := *, + listofIP4Elements := *, + listofIP6Elements := * + } + } + template (value) PDU_NS ts_NS_UNITDATA(template (value) NS_SDU_ControlBits bits, BssgpBvci bvci, octetstring sdu) := { pDU_NS_Unitdata := { nsPduType := '00'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0de6c483361a00a924a278a77151253450a0c1a2 Gerrit-Change-Number: 20006 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:13:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 04:13:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: implement f_outgoing_ns_reset References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 ) Change subject: RAW_NS: implement f_outgoing_ns_reset ...................................................................... RAW_NS: implement f_outgoing_ns_reset -> RESET <- RESET ACK Change-Id: I1a50615de4650266ca99216f8e4a18202678d669 --- M pcu/RAW_NS.ttcn 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/20007/1 diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn index c04a3e2..15a0226 100644 --- a/pcu/RAW_NS.ttcn +++ b/pcu/RAW_NS.ttcn @@ -105,6 +105,22 @@ } } +function f_outgoing_ns_reset(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { + timer T := tout; + var template PDU_NS reset := ts_NS_RESET(NS_CAUSE_EQUIPMENT_FAILURE, g_nsconfig[idx].nsvci, g_nsconfig[idx].nsei) + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], reset)); + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, g_nsconfig[idx].nsei))) { + setverdict(pass); + } + [] NSCP[idx].receive { repeat; } + [] T.timeout { + setverdict(fail, "Failed to receive a RESET ACK"); + } + } +} + /* perform outbound NS-BLOCK procedure */ function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1a50615de4650266ca99216f8e4a18202678d669 Gerrit-Change-Number: 20007 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:13:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 04:13:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 ) Change subject: SGSN: introduce NS tests ...................................................................... SGSN: introduce NS tests Similiar to the PCU_Tests_NS introduce SGSN_Tests_NS. Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 --- M sgsn/SGSN_Tests.ttcn A sgsn/SGSN_Tests_NS.cfg A sgsn/SGSN_Tests_NS.ttcn M sgsn/gen_links.sh 4 files changed, 98 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/20008/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 0e656a3..de00fa0 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -12,6 +12,7 @@ */ friend module SGSN_Tests_Iu; +friend module SGSN_Tests_NS; import from General_Types all; import from Osmocom_Types all; @@ -255,7 +256,7 @@ vc_GTP.start(GTP_Emulation.main(gtp_cfg)); } -private function f_init_vty() runs on test_CT { +friend function f_init_vty() runs on test_CT { map(self:SGSNVTY, system:SGSNVTY); f_vty_set_prompts(SGSNVTY); f_vty_transceive(SGSNVTY, "enable"); diff --git a/sgsn/SGSN_Tests_NS.cfg b/sgsn/SGSN_Tests_NS.cfg new file mode 100644 index 0000000..79ee0b2 --- /dev/null +++ b/sgsn/SGSN_Tests_NS.cfg @@ -0,0 +1,34 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./SGSN_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] +*.SGSNVTY.CTRL_HOSTNAME := "127.0.0.10" + +[MODULE_PARAMETERS] +SGSN_Components.mp_nsconfig := { + local_ip := "127.0.0.103", + local_udp_port := 22000, + remote_ip := "127.0.0.10", + remote_udp_port := 23000, + nsvci := 1234, + nsei := 1234 +} +SGSN_Tests.mp_ranap_cfg := { + { + sctp_addr := { 23908, "127.0.0.103", 2905, "127.0.0.200" } + } +} +SGSN_Tests.mp_hlr_ip := "127.0.0.103" +SGSN_Tests.mp_ggsn_ip := "127.0.0.103" + +[MAIN_CONTROLLER] + +[EXECUTE] +SGSN_Tests_NS.control diff --git a/sgsn/SGSN_Tests_NS.ttcn b/sgsn/SGSN_Tests_NS.ttcn new file mode 100644 index 0000000..376245f --- /dev/null +++ b/sgsn/SGSN_Tests_NS.ttcn @@ -0,0 +1,58 @@ +module SGSN_Tests_NS { + +/* Osmocom SGSN test suite in TTCN-3 + * (C) 2020 sysmocom - s.f.m.c. GmbH + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from Osmocom_Types all; +import from Osmocom_Gb_Types all; +import from Osmocom_VTY_Functions all; +import from NS_CodecPort all; +import from NS_Types all; +import from RAW_NS all; +import from SGSN_Tests all; + +type component RAW_Test_CT extends RAW_NS_CT, test_CT { +} + +testcase TC_NS_connect_reset() runs on RAW_Test_CT { + f_init_vty(); + f_init_ns_codec(guard_secs := 10.0); + f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock enabled"); + + /* Send a NS-ALIVE */ + f_outgoing_ns_reset(); + + f_sleep(1.0); + f_cleanup(); +} + +testcase TC_NS_connect_alive() runs on RAW_Test_CT { + f_init_vty(); + f_init_ns_codec(guard_secs := 10.0); + f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock disabled"); + + /* Send a NS-ALIVE */ + NSCP[0].send(t_NS_Send(g_ns_conn_id[0], t_NS_ALIVE)); + alt { + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); + [] NSCP[0].receive(t_NS_RecvFrom(tr_NS_STATUS(*))) { setverdict(fail); } + [] NSCP[0].receive { repeat; } + } + + f_sleep(1.0); + f_cleanup(); +} + +control { + execute( TC_NS_connect_alive() ); + execute( TC_NS_connect_reset() ); +} + +} diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index bd3a7ea..2a7829b 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -96,4 +96,8 @@ GTP_Templates.ttcn IPCP_Types.ttcn " gen_links $DIR $FILES +DIR=../pcu +FILES="RAW_NS.ttcn SGSN_Components.ttcn GPRS_Context.ttcn " +gen_links $DIR $FILES + ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:13:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 04:13:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 ) Change subject: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port ...................................................................... RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port When using RAW_NS for the SGSN this allows to change the source udp port for every test case Change-Id: I465ad2c8580e74cce4dab46f4ec29a9043df9938 --- M pcu/RAW_NS.ttcn M sgsn/SGSN_Tests_NS.ttcn 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/20009/1 diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn index 15a0226..5a68565 100644 --- a/pcu/RAW_NS.ttcn +++ b/pcu/RAW_NS.ttcn @@ -38,7 +38,7 @@ } } -function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { +function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0, integer tc_offset := 0) runs on RAW_NS_CT { var Result res; if (not g_T_guard.running) { @@ -51,7 +51,7 @@ g_nsconfig[idx] := mp_nsconfig; /* adjust those parts different for each NS-VC */ g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; - g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; + g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx + tc_offset; } map(self:NSCP[idx], system:NSCP); diff --git a/sgsn/SGSN_Tests_NS.ttcn b/sgsn/SGSN_Tests_NS.ttcn index 376245f..c7d0aac 100644 --- a/sgsn/SGSN_Tests_NS.ttcn +++ b/sgsn/SGSN_Tests_NS.ttcn @@ -23,7 +23,7 @@ testcase TC_NS_connect_reset() runs on RAW_Test_CT { f_init_vty(); - f_init_ns_codec(guard_secs := 10.0); + f_init_ns_codec(guard_secs := 10.0, tc_offset := 10); f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock enabled"); /* Send a NS-ALIVE */ @@ -35,7 +35,7 @@ testcase TC_NS_connect_alive() runs on RAW_Test_CT { f_init_vty(); - f_init_ns_codec(guard_secs := 10.0); + f_init_ns_codec(guard_secs := 10.0, tc_offset := 20); f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock disabled"); /* Send a NS-ALIVE */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I465ad2c8580e74cce4dab46f4ec29a9043df9938 Gerrit-Change-Number: 20009 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:17:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:17:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: support IPv6 NSVC addr In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 ) Change subject: library/PCUIF_Types: version 10: support IPv6 NSVC addr ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Gerrit-Change-Number: 19420 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 04:17:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:17:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:17:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: do not add redundant padding In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 ) Change subject: library/PCUIF_Types: version 10: do not add redundant padding ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a532d7abff8af354e40c5d706bb882efc6f905f Gerrit-Change-Number: 19570 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 04:17:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:46:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:46:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add Mobile Allocation length field In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 to look at the new patch set (#2). Change subject: library/PCUIF_Types: version 10: add Mobile Allocation length field ...................................................................... library/PCUIF_Types: version 10: add Mobile Allocation length field My initial assumption was that we can skip redundant '0'B bits or even '00'O octets in the Mobile Allocation IE, and thus reduce the overall size of this element. Unfortunately, this is wrong. 3GPP TS 44.018, section 10.5.2.21 clearly states that the Mobile Allocation IE contains a bit-string of size NF, where NF is the number of frequencies in the cell allocation. If NF % 8 != 0, then '0'B padding bits must be appended to make it octet-aligned. In other words, if the cell allocation contains let's say 13 frequencies, but a hopping timeslot makes use of only a small fraction of it (e.g. 4 first channels), we would still need to transmit at least 13 bits (+padding), including all redundant bits and octets. In RLC/MAC frames though it's not required to make the bit-string octet aligned, so we need to send exactly NF bits without padding. In order to achieve that: a) add MA length field to INFO.ind (record PCUIF_InfoTrxTs); b) ajust the existing test cases to use this field. It's safe to merge this change as the related patches have not been merged to osmo-pcu and osmo-bts yet. Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Related: SYS#4868, OS#4547 --- M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 15 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/19991/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Gerrit-Change-Number: 19991 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:46:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:46:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 ) Change subject: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() ...................................................................... PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() This way we also test different variations of MA length. Change-Id: Id886ed72c8a03fe2b27bc7add74eb0f58a2fe6ff Related: SYS#4868, OS#4547 --- M pcu/PCU_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/20010/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a4596bf..df2964c 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2162,8 +2162,11 @@ } /* Randomly generate a set of hopping parameters for one timeslot */ -private function f_TC_pcuif_fh_params_gen(integer ma_len) +private function f_TC_pcuif_fh_params_gen(integer max_ma_len) return template (value) PCUIF_InfoTrxTs { + /* Pick a random MA length in range 2 .. max_ma_len */ + var integer ma_len := 2 + f_rnd_int(max_ma_len - 2); + return ts_PCUIF_InfoTrxTsH1(tsc := f_rnd_int(7), hsn := f_rnd_int(63), maio := f_rnd_int(63), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id886ed72c8a03fe2b27bc7add74eb0f58a2fe6ff Gerrit-Change-Number: 20010 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 04:46:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 04:46:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn at 2165 PS1, Line 2165: private function f_TC_pcuif_fh_params_gen(integer ma_len) > Right, we don't really need a wrapper function here. [?] Actually, I (forgot that I) wanted pick a random MA length in range 2 .. ma_len, so it's more convenient to have a function returning a template. See: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 04:46:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:47:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:47:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: move RAW_NS into own file to use it in the SGSN tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20005 ) Change subject: PCU: move RAW_NS into own file to use it in the SGSN tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id91aa81c4fb6689cd1353d88b4806d26868769e8 Gerrit-Change-Number: 20005 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:47:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:47:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:47:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: add a simple tr_NS_STATUS() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20006 ) Change subject: Osmocom_Gb_Types: add a simple tr_NS_STATUS() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0de6c483361a00a924a278a77151253450a0c1a2 Gerrit-Change-Number: 20006 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:47:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:47:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:47:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: implement f_outgoing_ns_reset In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 ) Change subject: RAW_NS: implement f_outgoing_ns_reset ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1a50615de4650266ca99216f8e4a18202678d669 Gerrit-Change-Number: 20007 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:47:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:50:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:50:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 ) Change subject: SGSN: introduce NS tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008/1/sgsn/gen_links.sh File sgsn/gen_links.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008/1/sgsn/gen_links.sh at 98 PS1, Line 98: : DIR=../pcu : FILES="RAW_NS.ttcn SGSN_Components.ttcn GPRS_Context.ttcn " : gen_links $DIR $FILES I don't think we ever link some files that are not in library or in one of the dependency modules (Ericsson repositories). I'm not saying this is a strict rule, but at least it's something that needs to be reviewed carefully if we want to go there. I guess nobody editing some code in sgsn/ expects tests in other directories to break, for example. For RAW_NS, I see no reason why it cannot simply be moved to ../library. For the others, it requires review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:50:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:50:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:50:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: implement f_outgoing_ns_reset In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 ) Change subject: RAW_NS: implement f_outgoing_ns_reset ...................................................................... Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1a50615de4650266ca99216f8e4a18202678d669 Gerrit-Change-Number: 20007 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:51:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:51:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: implement f_outgoing_ns_reset In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 ) Change subject: RAW_NS: implement f_outgoing_ns_reset ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1a50615de4650266ca99216f8e4a18202678d669 Gerrit-Change-Number: 20007 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:51:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:51:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:51:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 ) Change subject: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I465ad2c8580e74cce4dab46f4ec29a9043df9938 Gerrit-Change-Number: 20009 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:51:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:51:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:51:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: move RAW_NS into own file to use it in the SGSN tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20005 ) Change subject: PCU: move RAW_NS into own file to use it in the SGSN tests ...................................................................... PCU: move RAW_NS into own file to use it in the SGSN tests In preparation to test the SGSN role of NS Change-Id: Id91aa81c4fb6689cd1353d88b4806d26868769e8 --- M pcu/PCU_Tests_NS.ttcn M pcu/PCU_Tests_SNS.ttcn A pcu/RAW_NS.ttcn 3 files changed, 215 insertions(+), 187 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index b1c8f38..ce2560f 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -26,14 +26,7 @@ import from IPL4asp_Types all; import from PCUIF_Types all; import from PCUIF_CodecPort all; - -type component RAW_NS_CT { - /* UDP port towards the bottom (IUT) */ - port NS_CODEC_PT NSCP[4]; - var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; - var NSConfiguration g_nsconfig[4]; - timer g_T_guard; -} +import from RAW_NS all; type component RAW_PCU_CT { /* PCUIF (we emulate the BTS part) */ @@ -44,13 +37,6 @@ type component RAW_Test_CT extends RAW_NS_CT, RAW_PCU_CT { } -private altstep as_Tguard() runs on RAW_NS_CT { - [] g_T_guard.timeout { - setverdict(fail, "Timeout of T_guard"); - mtc.stop; - } -} - function f_init_pcuif() runs on RAW_PCU_CT { var PCUIF_info_ind info_ind; map(self:PCU, system:PCU); @@ -73,73 +59,6 @@ PCU.send(t_SD_PCUIF(g_pcu_conn_id, msg)); } -function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { - var Result res; - - if (not g_T_guard.running) { - g_T_guard.start(guard_secs); - activate(as_Tguard()); - } - - if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { - /* copy most parts from mp_nsconfig */ - g_nsconfig[idx] := mp_nsconfig; - /* adjust those parts different for each NS-VC */ - g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; - g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; - } - - map(self:NSCP[idx], system:NSCP); - /* Connect the UDP socket */ - log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); - res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, - g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); - if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); - mtc.stop; - } - g_ns_conn_id[idx] := res.connId; - -} - -function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { - var NS_Recv>From nrf; - log("f_ns_exp() expecting ", exp_rx); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } - [] NSCP[idx].receive { - setverdict(fail, "Received unexpected NS: ", nrf); - mtc.stop; - } - } - return nrf.msg; -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); - [] NSCP[idx].receive { repeat; } - } -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { - timer T := tout; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - T.start; - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { - setverdict(fail, "Received unexpected NS-ALIVE ACK"); - } - [] NSCP[idx].receive { repeat; } - [] T.timeout { - setverdict(pass); - } - } -} - /* ensure no matching message is received within 'tout' */ function f_ensure_no_ns(template PDU_NS ns := ?, integer idx := 0, float tout := 3.0) runs on RAW_Test_CT { @@ -155,111 +74,6 @@ } } -/* perform outbound NS-BLOCK procedure */ -function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); - [] NSCP[idx].receive { repeat; } - } -} - -/* receive NS-ALIVE and ACK it */ -altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); - if (not oneshot) { repeat; } - } -} - -/* Transmit BSSGP RESET for given BVCI and expect ACK */ -function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) -runs on RAW_NS_CT { - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, - mp_gb_cfg.cell_id)); - timer T := 5.0; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - T.start; - alt { - [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET_ACK(bvci, ?)))) { - setverdict(pass); - } - [exp_ack] T.timeout { - setverdict(fail, "No response to BVC-RESET"); - } - [not exp_ack] T.timeout { - setverdict(pass); - } - [] NSCP[idx].receive { repeat; } - } -} - -/* Receive a BSSGP RESET for given BVCI and ACK it */ -altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - /* FIXME: nail down received cell_id in match */ - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET(?, bvci, ?)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - - -/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ -altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch t_BVC_UNBLOCK(bvci)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ -altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, - decmatch tr_BVC_FC_BVC))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; - var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/********************************************************************************** - * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * - **********************************************************************************/ - -/* Receive a NS-RESET and ACK it */ -private altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))); - if (not oneshot) { repeat; } - } -} -/* Receive a NS-UNBLOCK and ACK it */ -private altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); - if (not oneshot) { repeat; } - } -} - /* test the NS-RESET procedure */ testcase TC_ns_reset() runs on RAW_Test_CT { f_init_ns_codec(); diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index fc98979..dd133a3 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -16,6 +16,7 @@ import from Osmocom_Gb_Types all; import from NS_CodecPort all; import from NS_Types all; +import from RAW_NS all; /********************************************************************************** * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn new file mode 100644 index 0000000..c04a3e2 --- /dev/null +++ b/pcu/RAW_NS.ttcn @@ -0,0 +1,213 @@ +module RAW_NS { + +/* Osmocom NS test suite for NS in TTCN-3 + * (C) 2018-2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from SGSN_Components all; +import from Osmocom_Gb_Types all; +import from NS_CodecPort all; +import from NS_Types all; +import from BSSGP_Types all; +import from NS_CodecPort all; +import from NS_CodecPort_CtrlFunct all; +import from NS_Emulation all; +import from Native_Functions all; +import from IPL4asp_Types all; + +public type component RAW_NS_CT { + /* UDP port towards the bottom (IUT) */ + port NS_CODEC_PT NSCP[4]; + var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; + var NSConfiguration g_nsconfig[4]; + timer g_T_guard; +} + +public altstep as_Tguard() runs on RAW_NS_CT { + [] g_T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + mtc.stop; + } +} + +function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { + var Result res; + + if (not g_T_guard.running) { + g_T_guard.start(guard_secs); + activate(as_Tguard()); + } + + if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { + /* copy most parts from mp_nsconfig */ + g_nsconfig[idx] := mp_nsconfig; + /* adjust those parts different for each NS-VC */ + g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; + g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; + } + + map(self:NSCP[idx], system:NSCP); + /* Connect the UDP socket */ + log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); + res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, + g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); + mtc.stop; + } + g_ns_conn_id[idx] := res.connId; + +} + +function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { + var NS_RecvFrom nrf; + log("f_ns_exp() expecting ", exp_rx); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } + [] NSCP[idx].receive { + setverdict(fail, "Received unexpected NS: ", nrf); + mtc.stop; + } + } + return nrf.msg; +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); + [] NSCP[idx].receive { repeat; } + } +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { + timer T := tout; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { + setverdict(fail, "Received unexpected NS-ALIVE ACK"); + } + [] NSCP[idx].receive { repeat; } + [] T.timeout { + setverdict(pass); + } + } +} + +/* perform outbound NS-BLOCK procedure */ +function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); + [] NSCP[idx].receive { repeat; } + } +} + +/* receive NS-ALIVE and ACK it */ +altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); + if (not oneshot) { repeat; } + } +} + +/* Transmit BSSGP RESET for given BVCI and expect ACK */ +function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) +runs on RAW_NS_CT { + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, + mp_gb_cfg.cell_id)); + timer T := 5.0; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + T.start; + alt { + [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET_ACK(bvci, ?)))) { + setverdict(pass); + } + [exp_ack] T.timeout { + setverdict(fail, "No response to BVC-RESET"); + } + [not exp_ack] T.timeout { + setverdict(pass); + } + [] NSCP[idx].receive { repeat; } + } +} + +/* Receive a BSSGP RESET for given BVCI and ACK it */ +altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + /* FIXME: nail down received cell_id in match */ + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET(?, bvci, ?)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + + +/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ +altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch t_BVC_UNBLOCK(bvci)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ +altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_Recv>From ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, + decmatch tr_BVC_FC_BVC))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; + var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/********************************************************************************** + * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * + **********************************************************************************/ + +/* Receive a NS-RESET and ACK it */ +public altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))); + if (not oneshot) { repeat; } + } +} +/* Receive a NS-UNBLOCK and ACK it */ +public altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); + if (not oneshot) { repeat; } + } +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id91aa81c4fb6689cd1353d88b4806d26868769e8 Gerrit-Change-Number: 20005 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:51:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:51:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: add a simple tr_NS_STATUS() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20006 ) Change subject: Osmocom_Gb_Types: add a simple tr_NS_STATUS() ...................................................................... Osmocom_Gb_Types: add a simple tr_NS_STATUS() Change-Id: I0de6c483361a00a924a278a77151253450a0c1a2 --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 3aeba8f..7ddaada 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -334,6 +334,18 @@ } } + template PDU_NS tr_NS_STATUS(template NsCause cause) := { + pDU_NS_Status := { + nsPduType := '08'O, + causeNS := tr_NS_IE_CAUSE(cause), + nS_VCI := *, + nS_PDU := *, + bVCI_NS := *, + listofIP4Elements := *, + listofIP6Elements := * + } + } + template (value) PDU_NS ts_NS_UNITDATA(template (value) NS_SDU_ControlBits bits, BssgpBvci bvci, octetstring sdu) := { pDU_NS_Unitdata := { nsPduType := '00'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0de6c483361a00a924a278a77151253450a0c1a2 Gerrit-Change-Number: 20006 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:51:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:51:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: implement f_outgoing_ns_reset In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 ) Change subject: RAW_NS: implement f_outgoing_ns_reset ...................................................................... RAW_NS: implement f_outgoing_ns_reset -> RESET <- RESET ACK Change-Id: I1a50615de4650266ca99216f8e4a18202678d669 --- M pcu/RAW_NS.ttcn 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn index c04a3e2..15a0226 100644 --- a/pcu/RAW_NS.ttcn +++ b/pcu/RAW_NS.ttcn @@ -105,6 +105,22 @@ } } +function f_outgoing_ns_reset(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { + timer T := tout; + var template PDU_NS reset := ts_NS_RESET(NS_CAUSE_EQUIPMENT_FAILURE, g_nsconfig[idx].nsvci, g_nsconfig[idx].nsei) + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], reset)); + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, g_nsconfig[idx].nsei))) { + setverdict(pass); + } + [] NSCP[idx].receive { repeat; } + [] T.timeout { + setverdict(fail, "Failed to receive a RESET ACK"); + } + } +} + /* perform outbound NS-BLOCK procedure */ function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1a50615de4650266ca99216f8e4a18202678d669 Gerrit-Change-Number: 20007 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:53:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:53:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: support IPv6 NSVC addr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 ) Change subject: library/PCUIF_Types: version 10: support IPv6 NSVC addr ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Gerrit-Change-Number: 19420 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 06:53:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:53:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:53:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: do not add redundant padding In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 ) Change subject: library/PCUIF_Types: version 10: do not add redundant padding ...................................................................... Patch Set 3: why is it redundant? It was originally added to make sure the messages are the same length as when sent by the C implementation. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a532d7abff8af354e40c5d706bb882efc6f905f Gerrit-Change-Number: 19570 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:53:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 06:58:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 06:58:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: add IPv6 support for SNS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 ) Change subject: PCU: add IPv6 support for SNS ...................................................................... Patch Set 2: I somehow don't like the idea that IPv6 is a separate config file and that we have to execute the same test suite with multiple config files. This is difficult to use manually (people will forget to execute it a second time) and it also requires Junit XML rewriting as otherwise the results will be overwritten. I think it would be better if this was either integrated into the normale PCU_Tests module with tests containing ipv6 in the TC_... name, or maybe a PCU_Tests_IPV6.ttcn whihc then has the same list of test cases as the other one. Pluse a comment in the non-IPv6 tests that new test cases must be added twice. I'm not sure if there is a more elegant solution, i.e. if one control statment can 'inherit' another one - or if one wants to play with ttcnpp and #defines which then generate the control statement in both components. All not very elegant, probably. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I43d64caca600fff78f3fbbb3e8179f447f235d46 Gerrit-Change-Number: 20003 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 06:58:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:01:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:01:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn at 2165 PS1, Line 2165: private function f_TC_pcuif_fh_params_gen(integer ma_len) > Actually, I (forgot that I) wanted pick a random MA length in range 2 .. [?] I don't really understand the argument of why the linked patch would prevent this to be a template. In a template definition, you can also have function calls to those varios f_rnd_* functions. But anyway, you have your reasons. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:01:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:03:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:03:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add Mobile Allocation length field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 ) Change subject: library/PCUIF_Types: version 10: add Mobile Allocation length field ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Gerrit-Change-Number: 19991 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:03:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:03:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:03:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 ) Change subject: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id886ed72c8a03fe2b27bc7add74eb0f58a2fe6ff Gerrit-Change-Number: 20010 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 07:03:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:05:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:05:13 +0000 Subject: Change in osmo-pcu[master]: encoding: use CSN.1 codec to generate Packet Uplink Assignment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19787 ) Change subject: encoding: use CSN.1 codec to generate Packet Uplink Assignment ...................................................................... Patch Set 3: Code-Review+1 agreeing with pespin, a comment wouldn't be a bad idea! -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Gerrit-Change-Number: 19787 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:05:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:05:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:05:58 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19788 ) Change subject: encoding: implement handing of hopping parameters ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:05:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:07:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:07:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: add missing bound of nrf In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 ) Change subject: PCU_Tests_NS: add missing bound of nrf ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 Gerrit-Change-Number: 20002 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 07:07:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:09:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:09:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 ) Change subject: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I11d77b7477981998082967e5123b61636af2b980 Gerrit-Change-Number: 20001 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 07:09:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:09:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:09:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 ) Change subject: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I11d77b7477981998082967e5123b61636af2b980 Gerrit-Change-Number: 20001 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 07:09:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:50:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:50:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 ) Change subject: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE ...................................................................... PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE The ALIVE PDU does not have to be sent before an UNBLOCK message. Ignore UNBLOCK messages in cases a single ALIVE is expected. According to TS 48.016 v5.2.0, 7.4: "Upon successful completion of an NS-VC reset procedure, a BSS (or SGSN) shall start timer Tns-test, then [..]" The ALIVE should arive Tns-test after the reset procedure (typ. 1s-60s). Change-Id: I11d77b7477981998082967e5123b61636af2b980 --- M pcu/PCU_Tests_NS.ttcn 1 file changed, 13 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index ce2560f..f953be4 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -109,9 +109,11 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); + alt { /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - setverdict(pass); + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { setverdict(pass); }; + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; } + } } /* Test for NS-RESET after NS-ALIVE timeout */ @@ -123,12 +125,16 @@ as_rx_ns_reset_ack(oneshot := true); /* wait for at least one NS-ALIVE */ - NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)); + alt { + [] as_rx_alive_tx_ack(oneshot := true) { }; + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; } + } /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */ alt { [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); } [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; } + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; } } } @@ -140,8 +146,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); as_rx_ns_unblock_ack(oneshot := true); @@ -156,8 +161,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); /* wait for first NS-UNBLOCK, don't respond */ @@ -176,8 +180,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); as_rx_ns_unblock_ack(oneshot := true); @@ -203,8 +206,7 @@ /* Expect inbound NS-RESET procedure */ as_rx_ns_reset_ack(oneshot := true); - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); + /* keep it alive */ activate(as_rx_alive_tx_ack()); as_rx_ns_unblock_ack(oneshot := true); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I11d77b7477981998082967e5123b61636af2b980 Gerrit-Change-Number: 20001 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:50:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:50:55 +0000 Subject: Change in libosmocore[master]: gb/common_vty: use void * In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20000 ) Change subject: gb/common_vty: use void * ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac Gerrit-Change-Number: 20000 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:50:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:50:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:50:58 +0000 Subject: Change in libosmocore[master]: gb/common_vty: use void * In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20000 ) Change subject: gb/common_vty: use void * ...................................................................... gb/common_vty: use void * As long the filter doesn't look into the nsvc/bvc structs there is no need to use the type. Further it allows to use the same code for NS1 and NS2. Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac --- M src/gb/common_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c index a47294b..eb665d5 100644 --- a/src/gb/common_vty.c +++ b/src/gb/common_vty.c @@ -40,8 +40,8 @@ int gprs_log_filter_fn(const struct log_context *ctx, struct log_target *tar) { - const struct gprs_nsvc *nsvc = ctx->ctx[LOG_CTX_GB_NSVC]; - const struct gprs_bvc *bvc = ctx->ctx[LOG_CTX_GB_BVC]; + const void *nsvc = ctx->ctx[LOG_CTX_GB_NSVC]; + const void *bvc = ctx->ctx[LOG_CTX_GB_BVC]; /* Filter on the NS Virtual Connection */ if ((tar->filter_map & (1 << LOG_FLT_GB_NSVC)) != 0 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9b9a70f382a94f1d41142060d5db569f9df865ac Gerrit-Change-Number: 20000 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:51:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:51:15 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19997 ) Change subject: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I119f930e9cb5d6e52d4b0e1160604c709d942a18 Gerrit-Change-Number: 19997 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:51:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:51:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:51:48 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19998 ) Change subject: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I264a66a1405e72940a79e9e20ad6ad8f269a7bbc Gerrit-Change-Number: 19998 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:51:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:51:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:51:51 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19997 ) Change subject: generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro ...................................................................... generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro Change-Id: I119f930e9cb5d6e52d4b0e1160604c709d942a18 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 95eab4a..5aa52cf 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -258,9 +258,7 @@ } /* pad it to octet-aligned number of bits */ - ts->hopping.ma_len = num_cell_arfcns / 8; - if (num_cell_arfcns % 8) - ts->hopping.ma_len++; + ts->hopping.ma_len = OSMO_BYTES_FOR_BITS(num_cell_arfcns); n_chan = 0; for (i = 0; i < 1024; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I119f930e9cb5d6e52d4b0e1160604c709d942a18 Gerrit-Change-Number: 19997 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:51:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:51:51 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19998 ) Change subject: generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) ...................................................................... generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) According to 3GPP TS 44.018, table 10.5.2.21.1 "Mobile Allocation information element", in the cell allocation frequency list the absolute RF channel numbers are placed in increasing order, except that ARFCN 0, if included in the set, is put in the last position. This basically means that the last bit of the Mobile Allocation (MSB on the wire) corresponds to ARFCN 0, if it's included in the cell allocation frequency list, or the last channel otherwise. Recently introduced TTCN-3 test cases uncover the following problems: a) ARFCN 0 is encoded twice: as MSB and LSB of the bit-mask, b) ARFCN 0 is encoded one bit off its expected location. Change-Id: I264a66a1405e72940a79e9e20ad6ad8f269a7bbc Related: SYS#4868, OS#4545 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5aa52cf..ebae0a2 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -261,7 +261,7 @@ ts->hopping.ma_len = OSMO_BYTES_FOR_BITS(num_cell_arfcns); n_chan = 0; - for (i = 0; i < 1024; i++) { + for (i = 1; i < 1024; i++) { if (!bitvec_get_bit_pos(cell_chan, i)) continue; /* set the corresponding bit in the MA */ @@ -275,7 +275,6 @@ /* ARFCN 0 is special: It is coded last in the bitmask */ if (bitvec_get_bit_pos(cell_chan, 0)) { - n_chan++; /* set the corresponding bit in the MA */ bitnum = (ts->hopping.ma_len * 8) - 1 - n_chan; if (bitvec_get_bit_pos(ts_arfcn, 0)) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I264a66a1405e72940a79e9e20ad6ad8f269a7bbc Gerrit-Change-Number: 19998 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:52:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 ) Change subject: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Gerrit-Change-Number: 19993 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:52:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:52:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:52:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 ) Change subject: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia79efc9aa07b5088913d6679715f351d30f48d13 Gerrit-Change-Number: 19995 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:52:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:53:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:53:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 ) Change subject: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 Gerrit-Change-Number: 19994 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:53:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:53:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:53:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_handover_cmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 ) Change subject: BSC_Tests/hopping: add TC_fh_params_handover_cmd ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Gerrit-Change-Number: 19943 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:53:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:53:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:53:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 ) Change subject: BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back ...................................................................... BSC_Tests/hopping: fixup TC_fh_params_si4_cbch: bring CBCH back Change [1] introduced a regression that caused some TC_cbsp_* test cases to fail. The problem is that TC_fh_params_si4_cbch re-configures TS0 as CCCH+SDCCH4 instead of CCCH+SDCCH4+CBCH, so the CBCH channel vanishes after this test case is executed. [1] Ibc3b73697a1d2c8dbb27274e48f5e5ba21fdd540 Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fb9fa68..8944447 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7218,11 +7218,11 @@ /* Disable frequency hopping */ f_TC_fh_params_unset(fhp); - /* (Re)configure TS0 as CCCH+SDCCH4 and TS1 as TCH/F */ + /* (Re)configure TS0 as CCCH+SDCCH4+CBCH and TS1 as TCH/F */ f_vty_enter_cfg_trx(BSCVTY, trx := 0); f_vty_transceive(BSCVTY, "timeslot 0"); - f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4+cbch"); f_vty_transceive(BSCVTY, "exit"); /* go back */ f_vty_transceive(BSCVTY, "timeslot 1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia249f10c1b768a5af2b6c92ecba5d2941528f876 Gerrit-Change-Number: 19993 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:54:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:54:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 ) Change subject: BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask ...................................................................... BSC_Tests/hopping: fix: do not reduce Mobile Allocation bit-mask My initial assumption was that we can skip redundant '0'B bits or even '00'O octets in the Mobile Allocation IE, and thus reduce the overall size of this element. Unfortunately, this is wrong. 3GPP TS 44.018, section 10.5.2.21 clearly states that the Mobile Allocation IE contains a bit-string of size NF, where NF is the number of frequencies in the cell allocation. If NF % 8 != 0, then '0'B padding bits must be appended to make it octet-aligned. In other words, if the cell allocation contains let's say 13 frequencies, but a hopping timeslot makes use of only a small fraction of it (e.g. 4 first channels), we would still need to transmit at least 13 bits (+padding), including all redundant bits and octets. Change-Id: Ia79efc9aa07b5088913d6679715f351d30f48d13 Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8944447..de35e23 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6889,7 +6889,6 @@ var bitstring full_mask := f_pad_bit(''B, 1024, '0'B); var bitstring slot_mask := f_pad_bit(''B, 1024, '0'B); var bitstring ma_mask := ''B; - var integer ma_mask_len := 0; /* Compose the full bit-mask (all channels, up to 1024 entries) */ for (var integer i := 0; i < lengthof(fhp); i := i + 1) { @@ -6913,15 +6912,13 @@ /* FIXME: ma_mask := ma_mask & slot_mask[i]; // triggers a bug in TITAN */ if (slot_mask[i] == '1'B) { ma_mask := ma_mask & '1'B; - ma_mask_len := lengthof(ma_mask); } else { ma_mask := ma_mask & '0'B; } } /* Ensure that ma_mask is octet-aligned */ - ma_mask := substr(ma_mask, 0, ma_mask_len); - ma_mask_len := (ma_mask_len + 8 - 1) / 8; + var integer ma_mask_len := (lengthof(ma_mask) + 8 - 1) / 8; ma_mask := f_pad_bit(ma_mask, ma_mask_len * 8, '0'B); return { len := ma_mask_len, ma := ma_mask }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia79efc9aa07b5088913d6679715f351d30f48d13 Gerrit-Change-Number: 19995 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:54:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:54:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 ) Change subject: BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* ...................................................................... BSC_Tests/hopping: call f_shutdown_helper() in all TC_fh_params_* Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index de35e23..3906df6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7020,7 +7020,7 @@ /* Disable frequency hopping */ f_TC_fh_params_unset(fhp); - setverdict(pass); + f_shutdown_helper(); } /* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Immediate Assignment */ @@ -7068,7 +7068,7 @@ /* Disable frequency hopping */ f_TC_fh_params_unset(fhp); - setverdict(pass); + f_shutdown_helper(); } /* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Assignment Command */ @@ -7147,7 +7147,7 @@ /* Disable frequency hopping */ f_TC_fh_params_unset(fhp); - setverdict(pass); + f_shutdown_helper(); } /* Verify the hopping parameters in System Information Type 4 */ @@ -7226,7 +7226,7 @@ f_vty_transceive(BSCVTY, "phys_chan_config tch/f"); f_vty_transceive(BSCVTY, "end"); /* we're done */ - setverdict(pass); + f_shutdown_helper(); } /* Dyn PDCH todo: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I84d35bc6c50fb7404918b43022819713f3e86d37 Gerrit-Change-Number: 19994 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:54:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:54:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests/hopping: add TC_fh_params_handover_cmd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 ) Change subject: BSC_Tests/hopping: add TC_fh_params_handover_cmd ...................................................................... BSC_Tests/hopping: add TC_fh_params_handover_cmd Similar to TC_fh_params_assignment_cmd, this test case verifies presence and correctness of the hopping parameters in the following messages and their IEs: 1. (RR) Handover Command 1.1. Description of the First Channel, after time IE 1.2. Cell Channel Description IE (presence) 1.3. Mobile Allocation, after time IE The hopping parameters are randomly generated and configured via the VTY interface in the beginning, and unset in the end. Since the C0/TS0 (BCCH+SDCCH4+CBCH) shall not be hopping, let's temporarily re-configure TS0 as BCCH, and TS1 as SDCCH8 on TRX0 of BTS1 (handover tagret). Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Related: SYS#4868, OS#4545 --- M bsc/BSC_Tests.ttcn 1 file changed, 101 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 3906df6..f16fab4 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7150,6 +7150,106 @@ f_shutdown_helper(); } +/* Verify the hopping parameters (HSN, MAIO, MA) in (RR) Handover Command */ +private function f_TC_fh_params_handover_cmd(in FHParamsTrx fhp) +runs on test_CT { + var RSL_Message rsl_msg; + var RSL_IE_Body ie; + var DchanTuple dt; + + /* Establish a dedicated channel, so we can trigger handover */ + dt := f_est_dchan(f_rnd_ra_cs(), 23, f_rnd_octstring(16)); + + /* Trigger handover from BTS0 to BTS1 */ + f_bts_0_cfg(BSCVTY, { "neighbor bts 1" }); + f_vty_handover(BSCVTY, 0, 0, dt.rsl_chan_nr, 1); + + /* Expect RSL CHANnel ACTIVation on BTS1/TRX0/TS1 */ + rsl_msg := f_exp_ipa_rx(1, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); + + /* ACKnowledge channel activation and expect (RR) Handover Command */ + f_ipa_tx(1, ts_RSL_CHAN_ACT_ACK(rsl_msg.ies[0].body.chan_nr, 33)); + rsl_msg := f_exp_ipa_rx(0, tr_RSL_MsgTypeR(RSL_MT_DATA_REQ)); + + /* Make sure that L3 Information IE is present */ + if (not f_rsl_find_ie(rsl_msg, RSL_IE_L3_INFO, ie)) { + setverdict(fail, "RSL L3 Information IE is absent"); + return; + } + + /* Decode the L3 message and make sure it is (RR) Handover Command */ + var GsmRrL3Message l3_msg := dec_GsmRrL3Message(ie.l3_info.payload); + if (not match(l3_msg.header, t_RrL3Header(HANDOVER_COMMAND))) { + setverdict(fail, "Failed to match Handover Command: ", l3_msg); + return; + } + + /* Make sure that we've got SDCCH/8 on TS1 (expected to be hopping) */ + var ChannelDescription chan_desc := l3_msg.payload.ho_cmd.chan_desc; + if (not match(chan_desc.chan_nr, t_RslChanNr_SDCCH8(1, ?))) { + setverdict(fail, "Unexpected channel number: ", chan_desc.chan_nr); + return; + } + + /* Make sure that hopping parameters (HSN/MAIO) match */ + f_TC_fh_params_match_chan_desc(fhp, chan_desc); + + /* Make sure that Cell Channel Description IE is present */ + if (not ispresent(l3_msg.payload.ho_cmd.cell_chan_desc)) { + setverdict(fail, "FH enabled, but Cell Channel Description IE is absent"); + return; + } + + /* Make sure that the Mobile Allocation (after time) IE is present and matches */ + var boolean ma_present := ispresent(l3_msg.payload.ho_cmd.mobile_allocation); + if (ma_present) { + f_TC_fh_params_match_ma(fhp, chan_desc.chan_nr.tn, + l3_msg.payload.ho_cmd.mobile_allocation.v); + } else { + setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); + return; + } +} +testcase TC_fh_params_handover_cmd() runs on test_CT { + var FHParamsTrx fhp := f_TC_fh_params_gen(); + + f_init_vty(); + + /* (Re)configure TS0 as BCCH and TS1 as SDCCH8 on BTS1/TRX0 */ + f_vty_enter_cfg_trx(BSCVTY, bts := 1, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config sdcch8"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + f_TC_fh_params_set(fhp, 1); /* Enable frequency hopping on BTS1 */ + f_vty_transceive(BSCVTY, "drop bts connection 1 oml"); + + f_init(2); + + f_TC_fh_params_handover_cmd(fhp); + + /* Disable frequency hopping on BTS1 */ + f_TC_fh_params_unset(fhp, 1); + + /* (Re)configure TS0 as CCCH+SDCCH4+CBCH and TS1 as TCH/F */ + f_vty_enter_cfg_trx(BSCVTY, bts := 1, trx := 0); + + f_vty_transceive(BSCVTY, "timeslot 0"); + f_vty_transceive(BSCVTY, "phys_chan_config ccch+sdcch4+cbch"); + f_vty_transceive(BSCVTY, "exit"); /* go back */ + + f_vty_transceive(BSCVTY, "timeslot 1"); + f_vty_transceive(BSCVTY, "phys_chan_config tch/f"); + f_vty_transceive(BSCVTY, "end"); /* we're done */ + + f_shutdown_helper(); +} + /* Verify the hopping parameters in System Information Type 4 */ testcase TC_fh_params_si4_cbch() runs on test_CT { var FHParamsTrx fhp := f_TC_fh_params_gen(tr_tn := 1); @@ -7461,6 +7561,7 @@ execute( TC_fh_params_chan_activ() ); execute( TC_fh_params_imm_ass() ); execute( TC_fh_params_assignment_cmd() ); + execute( TC_fh_params_handover_cmd() ); execute( TC_fh_params_si4_cbch() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ddea535dce7e5558793be5cddaad0ab46e978ec Gerrit-Change-Number: 19943 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:55:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:55:17 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19988 ) Change subject: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8727460acbf850b84df67a9cbdc25b47dee1fadd Gerrit-Change-Number: 19988 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:55:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:55:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:55:30 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: add missing default labels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19989 ) Change subject: osmo-bts-trx/trx_provision_fsm: add missing default labels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I494ea9eb64634a03575a52750273cee7c68a8b3a Gerrit-Change-Number: 19989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:55:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:55:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:55:32 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: fix misleading comment in header In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19985 ) Change subject: osmo-bts-trx/trx_provision_fsm: fix misleading comment in header ...................................................................... osmo-bts-trx/trx_provision_fsm: fix misleading comment in header Change-Id: Iff9f073ce65bc443109107bb895124ec38dbbb10 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index f075e98..838433e 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -1,4 +1,4 @@ -/* BTS shutdown FSM */ +/* TRX provision FSM */ /* (C) 2020 by sysmocom - s.m.f.c. GmbH * Author: Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iff9f073ce65bc443109107bb895124ec38dbbb10 Gerrit-Change-Number: 19985 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:55:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:55:32 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19986 ) Change subject: osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function ...................................................................... osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function Change-Id: I56d2777bcc43c96b9fa1672d3ad29bf9817208bb --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 838433e..ad82961 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -258,7 +258,7 @@ { struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; - switch(event) { + switch (event) { case TRX_PROV_EV_OPEN: /* enable all slots */ l1h->config.slotmask = 0xff; @@ -289,7 +289,7 @@ int status; bool others_ready; - switch(event) { + switch (event) { case TRX_PROV_EV_CFG_ENABLE: l1h->config.enabled =(bool)data; break; @@ -422,7 +422,7 @@ struct phy_link *plink = pinst->phy_link; int rc; - switch(event) { + switch (event) { case TRX_PROV_EV_POWERON_CNF: rc = (uint16_t)(intptr_t)data; if (rc == 0 && plink->state != PHY_LINK_CONNECTED) { @@ -484,7 +484,7 @@ struct trx_prov_ev_cfg_ts_data* ts_data; uint8_t tn; - switch(event) { + switch (event) { case TRX_PROV_EV_CLOSE: /* power off transceiver, if not already */ if (l1h->config.enabled) { @@ -525,7 +525,7 @@ struct phy_link *plink = pinst->phy_link; int rc; - switch(event) { + switch (event) { case TRX_PROV_EV_POWEROFF_CNF: rc = (uint16_t)(intptr_t)data; if (plink->state != PHY_LINK_SHUTDOWN) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I56d2777bcc43c96b9fa1672d3ad29bf9817208bb Gerrit-Change-Number: 19986 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:55:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:55:33 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if: drop redundant logging message In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19987 ) Change subject: osmo-bts-trx/l1_if: drop redundant logging message ...................................................................... osmo-bts-trx/l1_if: drop redundant logging message We already get quite informative message originated from oml.c: OC=RADIO-CARRIER(02) INST=(00,00,ff): Rx OPSTART Change-Id: I3d4a4473541327488d3393b1fa7c6391afb3728a --- M src/osmo-bts-trx/l1_if.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index a2b3415..8cf0823 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -611,8 +611,7 @@ void *obj) { int rc; - LOGP(DOML, LOGL_DEBUG, "bts_model_opstart: %s received\n", - get_value_string(abis_nm_obj_class_names, mo->obj_class)); + switch (mo->obj_class) { case NM_OC_RADIO_CARRIER: /* activate transceiver */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3d4a4473541327488d3393b1fa7c6391afb3728a Gerrit-Change-Number: 19987 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:55:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:55:33 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19988 ) Change subject: osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly ...................................................................... osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly It was reported that both osmo-bsc and osmo-bts-trx may end up running in a half-broken state, when everything looks good and the UEs can see the network, but all channel requests get rejected due to "trx not usable" error: lchan_select.c:173 (bts=0) lchan_select_by_type(SDCCH) lchan_select.c:48 looking for lchan CCCH+SDCCH4: (bts=0,trx=0) trx not usable lchan_select.c:48 looking for lchan SDCCH8: (bts=0,trx=0) trx not usable lchan_select.c:239 (bts=0) Failed to select SDCCH channel lchan_select.c:173 (bts=0) lchan_select_by_type(TCH_H) lchan_select.c:48 looking for lchan TCH/H: (bts=0,trx=0) trx not usable lchan_select.c:239 (bts=0) Failed to select TCH_H channel lchan_select.c:173 (bts=0) lchan_select_by_type(TCH_F) lchan_select.c:48 looking for lchan TCH/F: (bts=0,trx=0) trx not usable lchan_select.c:239 (bts=0) Failed to select TCH_F channel As was then figured out, this happens because the Radio Carrier MO (Managed Object) remains Disabled even after the BSC has sent OPSTART and the BTS ACKed it: oml.c:986 OC=RADIO-CARRIER(02) INST=(00,00,ff): Rx OPSTART l1_if.c:614 Rx OPSTART for RADIO-CARRIER MO l1_if.c:201 TRX_PROV(phy0-0)[0x1238c0]{OPEN_POWERON}: Event TRX_PROV_EV_CFG_ENABLE not permitted oml.c:144 OC=RADIO-CARRIER(02) INST=(00,00,ff): Tx Opstart Ack It remains a mistery why the TRX_PROV FSM is already in state OPEN_POWERON, while it's expected to be in state OPEN_POWEROFF, but we definitely should not ACKnowledge the OPSTART if this happens. Send a NACK instead with cause NM_NACK_CANT_PERFORM. Change-Id: I8727460acbf850b84df67a9cbdc25b47dee1fadd Related: SYS#5063 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 8cf0823..430d97e 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -197,8 +197,11 @@ { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; + int rc; - osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true); + rc = osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true); + if (rc != 0) + return oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); if (trx == trx->bts->c0) lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8727460acbf850b84df67a9cbdc25b47dee1fadd Gerrit-Change-Number: 19988 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:55:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:55:33 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/trx_provision_fsm: add missing default labels In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19989 ) Change subject: osmo-bts-trx/trx_provision_fsm: add missing default labels ...................................................................... osmo-bts-trx/trx_provision_fsm: add missing default labels Change-Id: I494ea9eb64634a03575a52750273cee7c68a8b3a --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index ad82961..2e3115a 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -266,6 +266,8 @@ trx_if_cmd_poweroff(l1h, NULL); /* TODO: jump to poweroff upon cb received */ trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF); break; + default: + OSMO_ASSERT(0); } } @@ -444,6 +446,8 @@ case TRX_PROV_EV_CFG_TS: update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); break; + default: + OSMO_ASSERT(0); } } @@ -515,6 +519,8 @@ } break; + default: + OSMO_ASSERT(0); } } @@ -538,6 +544,8 @@ } } break; + default: + OSMO_ASSERT(0); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I494ea9eb64634a03575a52750273cee7c68a8b3a Gerrit-Change-Number: 19989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:56:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:56:13 +0000 Subject: Change in osmo-sip-connector[master]: Revert "sip: Specify invite contact tag" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 ) Change subject: Revert "sip: Specify invite contact tag" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 Gerrit-Change-Number: 19992 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Mon, 07 Sep 2020 07:56:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:56:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:56:16 +0000 Subject: Change in osmo-sip-connector[master]: Revert "sip: Specify invite contact tag" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 ) Change subject: Revert "sip: Specify invite contact tag" ...................................................................... Revert "sip: Specify invite contact tag" This reverts commit 52b2afce2ca902bbae4a550d03d471be784efe28. The contact header is generated by the original sofia-sip library. By adding the contact header explicit as user header it violates the SIP RFC because sofia will add the Contact header to the BYE message as well. Let's fix the bugs in the freeswitch sofia-sip and make it compatible (not bug compatible) with the original sofia-sip. Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 --- M src/sip.c 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sip.c b/src/sip.c index 61916c9..c635542 100644 --- a/src/sip.c +++ b/src/sip.c @@ -597,9 +597,6 @@ called_num, agent->app->sip.remote_addr, agent->app->sip.remote_port); - char *contact = talloc_asprintf(leg, "sip:%s:%d", - agent->app->sip.local_addr, - agent->app->sip.local_port); char *sdp = sdp_create_file(leg, other, sdp_sendrecv); leg->state = SIP_CC_INITIAL; @@ -607,7 +604,6 @@ nua_invite(leg->nua_handle, SIPTAG_FROM_STR(from), SIPTAG_TO_STR(to), - SIPTAG_CONTACT_STR(contact), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR("application/sdp"), SIPTAG_PAYLOAD_STR(sdp), @@ -616,7 +612,6 @@ leg->base.call->remote = &leg->base; talloc_free(from); talloc_free(to); - talloc_free(contact); talloc_free(sdp); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 Gerrit-Change-Number: 19992 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: matt9j Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:57:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:57:20 +0000 Subject: Change in libosmo-sccp[master]: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 ) Change subject: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07 Gerrit-Change-Number: 19984 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 07:57:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:57:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:57:23 +0000 Subject: Change in libosmo-sccp[master]: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 ) Change subject: add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() ...................................................................... add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() Avoid magic number 0xffffffff and rather provide a mask value for all address components. Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07 --- M include/osmocom/sigtran/sccp_sap.h M src/sccp_user.c 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index 817ac45..de9b24c 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -51,6 +51,7 @@ #define OSMO_SCCP_ADDR_T_SSN 0x0004 /* subsystem number */ #define OSMO_SCCP_ADDR_T_IPv4 0x0008 #define OSMO_SCCP_ADDR_T_IPv6 0x0010 +#define OSMO_SCCP_ADDR_T_MASK 0x001f /* Q.713 3.4.1 + RFC 3868 3.10.2.3 */ enum osmo_sccp_routing_ind { diff --git a/src/sccp_user.c b/src/sccp_user.c index e1329ac..880cab1 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -342,8 +342,8 @@ * The SCCP addresses' Routing Indicator is not compared, see osmo_sccp_addr_ri_cmp(). * \param[in] a left side. * \param[in] b right side. - * \param[in] presence_criteria A bitmask of OSMO_SCCP_ADDR_T_* values, or 0xffffffff to compare all parts, except the - * routing indicator. + * \param[in] presence_criteria A bitmask of OSMO_SCCP_ADDR_T_* values, or OSMO_SCCP_ADDR_T_MASK to compare all parts, + * except the routing indicator. * \return -1 if a < b, 1 if a > b, and 0 if all checked values match. */ int osmo_sccp_addr_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b, uint32_t presence_criteria) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07 Gerrit-Change-Number: 19984 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 07:58:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 07:58:10 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19419 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 2: deferring this to pespin. please work it out with him :) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 07:58:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:03:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:03:57 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: prioritize emergency calls over regular calls In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19793 ) Change subject: abis_rsl: prioritize emergency calls over regular calls ...................................................................... Patch Set 4: Code-Review+1 (1 comment) I hope this is finally the last comment. Happy to give +2 if that one is addressed. https://gerrit.osmocom.org/c/osmo-bsc/+/19793/4/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19793/4/src/osmo-bsc/abis_rsl.c at 1403 PS4, Line 1403: rqd_first I would simply use llist_first_entry(&bts->chan_rqd_queue) here rather than caching the first element (rqd_first). Let's avoid strange special cases. llist_first_entry is also only one pointer dereference, so it is not more expensive. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Gerrit-Change-Number: 19793 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 07 Sep 2020 08:03:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:04:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:04:37 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... Patch Set 19: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19416/19/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19416/19/src/socket.c at 1684 PS19, Line 1684: if (rc < 0) > Simply return rc; here? Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 19 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:04:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:05:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:05:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Fix wrong mgcp conn expected in several places In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 ) Change subject: msc: Fix wrong mgcp conn expected in several places ...................................................................... msc: Fix wrong mgcp conn expected in several places Change-Id: I0bb15881e640fe49552108679894d5df15339fc8 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 053a5f6..b24cb8d 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -857,7 +857,7 @@ }, mgw_conn_2 := { resp := 1, - mgw_rtp_ip := "1.1.1.1", + mgw_rtp_ip := "2.2.2.2", mgw_rtp_port := 11000, mgcp_connection_id := '22222'H }, @@ -988,9 +988,9 @@ /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("f_mt_call_complete 8"); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip, hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, + cpars.mgw_conn_1.mgw_rtp_port, { int2str(cpars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, cpars.rtp_sdp_format)), @@ -1003,7 +1003,7 @@ } mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp); } else { - mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp); + mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp); } MGCP.send(mgcp_resp); } @@ -1073,9 +1073,9 @@ /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("f_mt_call_complete 8.iu"); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip, hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, + cpars.mgw_conn_1.mgw_rtp_port, { int2str(cpars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, cpars.rtp_sdp_format)), @@ -1088,7 +1088,7 @@ } mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp); } else { - mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp); + mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp); } MGCP.send(mgcp_resp); } @@ -1423,9 +1423,9 @@ /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("f_mo_call_establish 5: rx MDCX for the RAN side"); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip, hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, + cpars.mgw_conn_1.mgw_rtp_port, { int2str(cpars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, cpars.rtp_sdp_format)), @@ -1439,7 +1439,7 @@ } mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp); } else { - mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp); + mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp); } MGCP.send(mgcp_resp); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0bb15881e640fe49552108679894d5df15339fc8 Gerrit-Change-Number: 19975 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:05:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:05:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MGCP_Templates: Apply MGCP AddressType based on provided address In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 ) Change subject: library/MGCP_Templates: Apply MGCP AddressType based on provided address ...................................................................... library/MGCP_Templates: Apply MGCP AddressType based on provided address Change-Id: I1212abd31f6a4758105675908a1b7cb841caa3dd --- M library/MGCP_Templates.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index e03fd8e..79d9670 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -310,13 +310,13 @@ integer rtp_port, SDP_fmt_list fmts, SDP_attribute_list attributes) := { protocol_version := 0, - origin := ts_SDP_origin(local_addr, session_id, session_version), + origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), session_name := "-", information := omit, uri := omit, emails := omit, phone_numbers := omit, - connection := ts_SDP_connection_IP(remote_addr), + connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), bandwidth := omit, times := { ts_SDP_time("0","0") }, timezone_adjustments := omit, @@ -341,6 +341,15 @@ } } + function f_mgcp_addr2addrtype(charstring addr) return charstring { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return "IP6"; + } + } + return "IP4"; + } + /* -1 is wildcard, positive is translated as string */ function f_mgcp_osmux_cid_encode(MgcpOsmuxCID osmux_cid) return charstring { if (osmux_cid == -1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1212abd31f6a4758105675908a1b7cb841caa3dd Gerrit-Change-Number: 19973 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:05:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:05:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Add template helpers for AoIP Transport Layer Address In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 ) Change subject: library: Add template helpers for AoIP Transport Layer Address ...................................................................... library: Add template helpers for AoIP Transport Layer Address This way one can simply pass an IP addr in string format and return the IE no matter the IP version. Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 --- M bsc-nat/gen_links.sh M library/BSSMAP_Templates.ttcn M library/Misc_Helpers.ttcn M selftest/gen_links.sh 4 files changed, 35 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 4d2303f..9bd1faf 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -52,7 +52,7 @@ gen_links $DIR $FILES DIR=../library -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 RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.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 RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn BSSAP_CodecPort.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES ignore_pp_results diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 694e3e8..0ec5639 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -14,6 +14,8 @@ import from General_Types all; import from Osmocom_Types all; +import from Native_Functions all; +import from Misc_Helpers all; import from GSM_Types all; import from BSSAP_Types all; @@ -436,6 +438,17 @@ template (value) BSSMAP_IE_AoIP_TransportLayerAddress ts_BSSMAP_IE_AoIP_TLA6(OCT16 ip, uint16_t pt) := ts_BSSMAP_IE_AoIP_TLA({ipv6:=ip}, pt, 18); +function f_ts_BSSMAP_IE_AoIP_TLA(charstring addr, uint16_t udp_port) + return template (value) BSSMAP_IE_AoIP_TransportLayerAddress { + if (f_addr_is_ipv6(addr)) { + var OCT16 ip6 := f_inet6_addr(addr); + return ts_BSSMAP_IE_AoIP_TLA6(ip6, udp_port); + } else { + var OCT4 ip := f_inet_addr(addr); + return ts_BSSMAP_IE_AoIP_TLA4(ip, udp_port); + } +} + template BSSMAP_IE_AoIP_TransportLayerAddress tr_BSSMAP_IE_AoIP_TLA(template BSSMAP_FIELD_IPAddress addr, template uint16_t udp_port, template integer len := ?) := { @@ -449,6 +462,17 @@ template BSSMAP_IE_AoIP_TransportLayerAddress tr_BSSMAP_IE_AoIP_TLA6(template OCT16 ip, template uint16_t pt) := tr_BSSMAP_IE_AoIP_TLA({ipv6:=ip}, pt, 18); +function f_tr_BSSMAP_IE_AoIP_TLA(charstring addr, template uint16_t udp_port) + return template BSSMAP_IE_AoIP_TransportLayerAddress { + if (f_addr_is_ipv6(addr)) { + var OCT16 ip6 := f_inet6_addr(addr); + return tr_BSSMAP_IE_AoIP_TLA6(ip6, udp_port); + } else { + var OCT4 ip := f_inet_addr(addr); + return tr_BSSMAP_IE_AoIP_TLA4(ip, udp_port); + } +} + template (value) BSSMAP_IE_KC128 ts_BSSMAP_IE_Kc128(OCT16 kc128) := { elementIdentifier := '83'O, kC128_Value := kc128 diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index 1ca6491..a402525 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -25,4 +25,13 @@ mtc.stop } +function f_addr_is_ipv6(charstring addr) return boolean { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return true; + } + } + return false; +} + } diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index fd64a48..7b15de2 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -39,7 +39,7 @@ gen_links $DIR $FILES DIR=../library -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_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_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 Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I743dbb7c89e504762498b7f278c12e130352e5f0 Gerrit-Change-Number: 19979 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:06:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:06:40 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 08:06:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:08:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:08:00 +0000 Subject: Change in osmo-bts[master]: bts-trx: Ensure RFMUTE state is set properly at startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19830 ) Change subject: bts-trx: Ensure RFMUTE state is set properly at startup ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25 Gerrit-Change-Number: 19830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:08:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:08:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:08:09 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19827 ) Change subject: bts-trx: Use TRXC RFMUTE instead of resetting the scheduler ...................................................................... bts-trx: Use TRXC RFMUTE instead of resetting the scheduler Since commit 221ee92551a3d34c4f61e99e5bf4aa718c4d6f88, bts_model_trx_deact_rf() was being called when RF locking the TRX, which was implemented by resetting the scheduler. This proved to be a messy and wrong way to emulate disabling RF, since it modifies tate on lots of structures from which it is later difficult to recover from, causing bugs and issues like: 82a35a1dbff849ecf16b7c70de4c1c7786704b2e be15a12c87983ef07fb133fedea4ef18d2213bc6 eef420d1ca2144682d3de3f4e5cc4a7458276a03 https://osmocom.org/issues/4694 https://osmocom.org/issues/4695 https://osmocom.org/issues/4696 https://osmocom.org/issues/4697 So for all these reasons, it is believed a good solution to avoid resetting the scheduler and simply ask lower layers (osmo-trx) to take care of disabling RF TX/RX on a given TRX. For TRX implementations not supporting the newly added RFMUTE command, ramping down to -10dBm still provides for a way to emulate RF locking. In any case, none of this was supported until recently so it's not like we are breaking some feature here. Related: SYS#4920 Change-Id: I1423ddb390ef327ec7d4a27de2ac5dca663773a5 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 3 files changed, 19 insertions(+), 40 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 430d97e..bc0df2b 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -215,18 +215,8 @@ { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - enum gsm_phys_chan_config pchan = trx->ts[0].pchan; - /* close all logical channels and reset timeslots */ - trx_sched_reset(&l1h->l1s); - - /* deactivate lchan for CCCH */ - if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 || - pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { - lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_INACTIVE); - } - - return 0; + return trx_if_cmd_rfmute(l1h, true); } /* deactivate transceiver */ @@ -651,12 +641,14 @@ { struct gsm_bts_trx *trx; struct phy_instance *pinst; - int i, rc = 0; + struct trx_l1h *l1h; + int rc = 0; switch (mo->obj_class) { case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; pinst = trx_phy_instance(trx); + l1h = pinst->u.osmotrx.hdl; /* Begin to ramp the power if TRX is already running. Otherwise * skip, power ramping will be started after TRX is running */ @@ -670,20 +662,18 @@ if (mo->nm_state.administrative == NM_STATE_LOCKED && adm_state == NM_STATE_UNLOCKED) { /* Previous change was UNLOCKED->LOCKED, so we - * were ramping down and we didn't deactivate + * were ramping down and we didn't mute RF * yet, so now simply skip old ramp down compl - * cb, skip TS activation and go for ramp up + * cb, skip RF unmute and go for ramp up * directly. */ goto ramp_up; } else if (mo->nm_state.administrative == NM_STATE_UNLOCKED && adm_state == NM_STATE_LOCKED) { - /* Previous change was LOCKED->UNLOCKED, which - * means TS were also enabled during start of - * ramping up. So we simply need to skip - * ramping up and start ramping down instead, - * disabling TS at the end as usual. Fall - * through usual procedure below. - */ + /* Previous change was LOCKED->UNLOCKED, so we + * simply need to skip ramping up and start + * ramping down instead, muting RF at the + * end as usual. Fall through usual procedure + * below. */ } else if (mo->nm_state.administrative == adm_state) { OSMO_ASSERT(0); } @@ -695,25 +685,7 @@ break; case NM_STATE_UNLOCKED: mo->procedure_pending = 1; - /* Activate timeslots in scheduler and start power ramp up */ - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { - /* dyn.pchan_is is set to GSM_PCHAN_NONE when - * internally deactivated during locking. Simply - * internally restore the old status here. - */ - ts->dyn.pchan_is = ts->dyn.pchan_want; - } else if (ts->pchan == GSM_PCHAN_TCH_F_PDCH && ts->flags & TS_F_PDCH_PENDING_MASK) { - /* TS configuration already in progress, - * waiting for PCU response, let it be - * de/activated later by PCU ACT CNF as a - * response to pcu_tx_info_ind() - */ - continue; - } - trx_set_ts(ts); - } + trx_if_cmd_rfmute(l1h, false); ramp_up: rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb); if (rc == 0) { diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 875487a..05167ca 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -376,6 +376,12 @@ return trx_ctrl_cmd(l1h, 1, "NOHANDOVER", "%d %d", tn, ss); } +/*! Send "RFMUTE" command to TRX: Mute or Unmute RF transmission */ +int trx_if_cmd_rfmute(struct trx_l1h *l1h, bool mute) +{ + return trx_ctrl_cmd(l1h, 0, "RFMUTE", mute ? "1" : "0"); +} + struct trx_ctrl_rsp { char cmd[50]; char params[100]; diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index 6b417cf..17bc7db 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -35,6 +35,7 @@ int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb); int trx_if_cmd_handover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); int trx_if_cmd_nohandover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); +int trx_if_cmd_rfmute(struct trx_l1h *l1h, bool mute); int trx_if_send_burst(struct trx_l1h *l1h, const struct trx_dl_burst_req *br); int trx_if_powered(struct trx_l1h *l1h); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1423ddb390ef327ec7d4a27de2ac5dca663773a5 Gerrit-Change-Number: 19827 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Hoernchen Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:08:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 08:08:09 +0000 Subject: Change in osmo-bts[master]: bts-trx: Ensure RFMUTE state is set properly at startup In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19830 ) Change subject: bts-trx: Ensure RFMUTE state is set properly at startup ...................................................................... bts-trx: Ensure RFMUTE state is set properly at startup In general, it is always set to 1 (Locked) in st_open_poweroff_on_enter() right after initial POWEROFF, and once the BSC unlocks it (based on VTY cfg "rf_locked (0|1)") by sending an OML message, the bts_model_chg_adm_state() call will update it sending RFMUTE. This basically fixes the case where osmo-bsc.cfg is configured with "rf_locked 1" to start with a TRX locked until manually unlocked. Related: SYS#4920 Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c 2 files changed, 9 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index bc0df2b..9893f45 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -651,9 +651,13 @@ l1h = pinst->u.osmotrx.hdl; /* Begin to ramp the power if TRX is already running. Otherwise - * skip, power ramping will be started after TRX is running */ - if (!pinst->phy_link->u.osmotrx.powered) + * skip, power ramping will be started after TRX is running. + * We still want to make sure to update RFMUTE status on the + * other side. */ + if (!pinst->phy_link->u.osmotrx.powered) { + trx_if_cmd_rfmute(l1h, adm_state != NM_STATE_UNLOCKED); break; + } if (mo->procedure_pending) { LOGPTRX(trx, DL1C, LOGL_INFO, diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 2e3115a..33a37b3 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -277,6 +277,9 @@ struct phy_instance *pinst = l1h->phy_inst; l1h->config.trxd_hdr_ver_req = pinst->phy_link->u.osmotrx.trxd_hdr_ver_max; + + /* Apply initial RFMUTE state */ + trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED); } static void st_open_poweroff(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25 Gerrit-Change-Number: 19830 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:13:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 08:13:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: Code-Review+1 agree with laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:13:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:14:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 08:14:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add Mobile Allocation length field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 ) Change subject: library/PCUIF_Types: version 10: add Mobile Allocation length field ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Gerrit-Change-Number: 19991 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:14:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:15:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 08:15:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 ) Change subject: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id886ed72c8a03fe2b27bc7add74eb0f58a2fe6ff Gerrit-Change-Number: 20010 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:15:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:23:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 08:23:31 +0000 Subject: Change in osmo-bts[master]: scheduler: Drop unused function trx_sched_reset() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20011 ) Change subject: scheduler: Drop unused function trx_sched_reset() ...................................................................... scheduler: Drop unused function trx_sched_reset() Change-Id: Id31e82b6bbfdd8030612c78737c0aa7dd7e20bd0 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c 2 files changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/11/20011/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 47c0e9a..0d86347 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -192,10 +192,6 @@ int trx_sched_set_cipher(struct l1sched_trx *l1t, uint8_t chan_nr, int downlink, int algo, uint8_t *key, int key_len); -/* \brief close all logical channels and reset timeslots */ -void trx_sched_reset(struct l1sched_trx *l1t); - - /* frame structures */ struct trx_sched_frame { /*! \brief downlink TRX channel type */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index c5b3830..e7cbc83 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -639,13 +639,6 @@ } } -/* close all logical channels and reset timeslots */ -void trx_sched_reset(struct l1sched_trx *l1t) -{ - trx_sched_exit(l1t); - trx_sched_init(l1t, l1t->trx); -} - struct msgb *_sched_dequeue_prim(struct l1sched_trx *l1t, int8_t tn, uint32_t fn, enum trx_chan_type chan) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id31e82b6bbfdd8030612c78737c0aa7dd7e20bd0 Gerrit-Change-Number: 20011 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:26:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 08:26:44 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19419 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 2: Code-Review-1 I'm sorry but I'm really disliking the use of IPPROTO here, it makes no sense to use it here (since the define is about IP over IP), it's confusing and using those instead of defining them in the protocol header makes the protocol depend on some header for no good reason. Either use AF_INET(6) which can be passed nicely over a unix socket, or define our own PCU protocol defines for PROTO_IPv4 and PROTO_IPv6. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 08:26:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:27:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 08:27:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn at 2165 PS1, Line 2165: private function f_TC_pcuif_fh_params_gen(integer ma_len) > I don't really understand the argument of why the linked patch would prevent this to be a template. [?] It wouldn't, but this is how it would look like: private template ts_TC_pcuif_fh_params(integer ma_len) := { tsc := f_rnd_int(7), hsn := f_rnd_int(63), maio := f_rnd_int(63), ma := f_pad_bit(f_rnd_bitstring(2 + f_rnd_int(ma_len - 2)), 64, '0'B) }; this looks cumbersome and less readable to me. If it's ok for you, I can amend the patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:27:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:28:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 08:28:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn at 2165 PS1, Line 2165: private function f_TC_pcuif_fh_params_gen(integer ma_len) > It wouldn't, but this is how it would look like: [?] As long as you add some comment explaining it, it's fine imho. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:28:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:41:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 08:41:42 +0000 Subject: Change in osmo-bts[master]: scheduler: Drop unused function trx_sched_reset() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20011 ) Change subject: scheduler: Drop unused function trx_sched_reset() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id31e82b6bbfdd8030612c78737c0aa7dd7e20bd0 Gerrit-Change-Number: 20011 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 07 Sep 2020 08:41:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 08:55:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 08:55:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990/1/pcu/PCU_Tests.ttcn at 2165 PS1, Line 2165: private function f_TC_pcuif_fh_params_gen(integer ma_len) > As long as you add some comment explaining it, it's fine imho. Is it possible to reference a field of template in its own definition? In the example above I missed the 'ma_len' field, so it must have been something like this: private template (value) PCUIF_InfoTrxTs ts_TC_pcuif_fh_params(integer ma_len) := { tsc := f_rnd_int(7), hsn := f_rnd_int(63), maio := f_rnd_int(63), ma_len := 2 + f_rnd_int(ma_len - 2), ma := f_pad_bit(f_rnd_bitstring(self.ma_len), 64, '0'B) // (!) }; That would be a beautiful solution, but TITAN throws a syntax error :/ If TITAN's PADDING attribute was smarter than it is now, I would implement automatic 'ma_len' calculation and automatic padding, but... https://bugs.eclipse.org/bugs/show_bug.cgi?id=562849 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 08:55:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 09:46:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 09:46:30 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: copy back Connection Information from MDCX ACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19953 ) Change subject: mgcp_client: copy back Connection Information from MDCX ACK ...................................................................... Patch Set 1: I would like getting at least up till here merged soon (libosmo-mgcp-client), since I'm mostly finished with ttcn3 tests in osmo-bsc and osmo-msc. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc Gerrit-Change-Number: 19953 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-Comment-Date: Mon, 07 Sep 2020 09:46:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 10:11:48 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 7 Sep 2020 10:11:48 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use NUM_E1_TS from e1_input.h References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20012 ) Change subject: mgcp_endp: use NUM_E1_TS from e1_input.h ...................................................................... mgcp_endp: use NUM_E1_TS from e1_input.h do not introduce another define constant, use NUM_E1_TS as number of E1 timeslots. Change-Id: I3bbfb6822d5595f9d243849141883490fa8037cb --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/12/20012/1 diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 668d88b..c4f3653 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -27,9 +27,9 @@ #include #include +#include #include -#define E1_TIMESLOTS 32 #define E1_RATE_MAX 64 #define E1_OFFS_MAX 8 @@ -375,7 +375,7 @@ if (strncmp(token, "s-", 2) == 0) { errno = 0; res = strtoul(token + 2, NULL, 10); - if (errno == ERANGE || res > E1_TIMESLOTS) + if (errno == ERANGE || res > NUM_E1_TS) return 0xff; return (uint8_t) res; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bbfb6822d5595f9d243849141883490fa8037cb Gerrit-Change-Number: 20012 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 10:11:49 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 7 Sep 2020 10:11:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: increase default number of virtual endpoints References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20013 ) Change subject: mgcp_trunk: increase default number of virtual endpoints ...................................................................... mgcp_trunk: increase default number of virtual endpoints The VTY default for the number of endpoints is 32. This is sufficient for small setups and lab testing, but for medium sized setupts the limit might be reached soon. Lets increase the default to 512 virtual endpoints. Change-Id: I55605ea083565b6950d0820e3f72c50c9dc19ffa Related: OS#4711 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/13/20013/1 diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 84ad220..8ff6f6a 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -50,7 +50,7 @@ trunk->audio_send_ptime = 1; trunk->audio_send_name = 1; - trunk->v.vty_number_endpoints = 32; + trunk->v.vty_number_endpoints = 512; trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I55605ea083565b6950d0820e3f72c50c9dc19ffa Gerrit-Change-Number: 20013 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 10:14:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 10:14:23 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use NUM_E1_TS from e1_input.h In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20012 ) Change subject: mgcp_endp: use NUM_E1_TS from e1_input.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bbfb6822d5595f9d243849141883490fa8037cb Gerrit-Change-Number: 20012 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 07 Sep 2020 10:14:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 10:14:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 10:14:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: increase default number of virtual endpoints In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20013 ) Change subject: mgcp_trunk: increase default number of virtual endpoints ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I55605ea083565b6950d0820e3f72c50c9dc19ffa Gerrit-Change-Number: 20013 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 07 Sep 2020 10:14:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 10:19:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 10:19:31 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: increase default number of virtual endpoints In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20013 ) Change subject: mgcp_trunk: increase default number of virtual endpoints ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I55605ea083565b6950d0820e3f72c50c9dc19ffa Gerrit-Change-Number: 20013 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 10:19:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 10:20:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 10:20:04 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use NUM_E1_TS from e1_input.h In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20012 ) Change subject: mgcp_endp: use NUM_E1_TS from e1_input.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bbfb6822d5595f9d243849141883490fa8037cb Gerrit-Change-Number: 20012 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 10:20:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 10:50:41 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 7 Sep 2020 10:50:41 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: prioritize emergency calls over regular calls In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 to look at the new patch set (#5). Change subject: abis_rsl: prioritize emergency calls over regular calls ...................................................................... abis_rsl: prioritize emergency calls over regular calls when an emergency call arrives while all TCH are busy, the BSC should pick an arbitrary (preferably the longest lasting) call / lchan and release it in favor of the incoming emergancy call. The release of the existing call is a process that can not be done synchronously while the ChanRQD is handled sonce multiple messages are exchanged between BTS and MSC and multiple FSMs need to do their work. To be able to release one lchan while handling a ChanRQD a queue is implemented in which the incomming channel requests are collected. If an emergency call is established while all channels are busy, an arbitrary lchan is picked and freed. When freeing the lchan is done, the queue is checked again and the emergency call is put on the free lchan (TCH/H or TCH/F). Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Related: OS#4549 --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_fsm.h M include/osmocom/bsc/lchan_select.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 8 files changed, 284 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/19793/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Gerrit-Change-Number: 19793 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 11:36:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 11:36:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 to look at the new patch set (#4). Change subject: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 ...................................................................... msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 It tests IPv6 Transport Address are passed correctly through BSSAP, and forwards handles them correctly as an MGCP client too. Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 91 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/19974/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:11:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 12:11:47 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 to look at the new patch set (#2). Change subject: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX This is needed to be able to force MGW to provide an IPv4 address during MDCX, since IPACC protocol on the BTS side only supports IPv4, but one may need IPv6 side at the same time on the core side. By moving the IPACC MDCX request to a later step, the BSC gains knowledge of the local address on each side (BTS, MGW), and if they don't match (ie. BTS uses IPv4 and MGW uses IPv6), it can then get MGW to offer an IPv4 address during MGCP MDCX containing the BTS IPv4 address. At that point, the MGW can see the mismatch and provide an IPv4 address in the MGCP MDCX ACK, which can then finally be communicated to the BTS during IPACC MDCX phase. Previous order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK (get MGW local IP addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IP addr) BSC -> BTS: IPACC MDCX (set MGW IP addr) BSC <- BTS: IPACC MDCX ACK BSC -> MGW: MDCX (set BTS IP addr) BSC <- MGW: MDCX ACK New order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK (get MGCP local IPv6 addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IPv4 addr) BSC -> MGW: MDCX (set BTS IPv4 addr) BSC <- MGW: MDCX ACK (here MGW changes its local addr to IPv6 BSC -> BTS: IPACC MDCX (set MGW IPv6 addr) BSC <- BTS: IPACC MDCX ACK Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 --- M doc/lchan-rtp-fsm.dot M doc/lchan.msc M src/osmo-bsc/lchan_rtp_fsm.c 3 files changed, 36 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/19954/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:49:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:49:25 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: increase default number of virtual endpoints In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20013 ) Change subject: mgcp_trunk: increase default number of virtual endpoints ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I55605ea083565b6950d0820e3f72c50c9dc19ffa Gerrit-Change-Number: 20013 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 12:49:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:49:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:49:52 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use NUM_E1_TS from e1_input.h In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20012 ) Change subject: mgcp_endp: use NUM_E1_TS from e1_input.h ...................................................................... mgcp_endp: use NUM_E1_TS from e1_input.h do not introduce another define constant, use NUM_E1_TS as number of E1 timeslots. Change-Id: I3bbfb6822d5595f9d243849141883490fa8037cb --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 668d88b..c4f3653 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -27,9 +27,9 @@ #include #include +#include #include -#define E1_TIMESLOTS 32 #define E1_RATE_MAX 64 #define E1_OFFS_MAX 8 @@ -375,7 +375,7 @@ if (strncmp(token, "s-", 2) == 0) { errno = 0; res = strtoul(token + 2, NULL, 10); - if (errno == ERANGE || res > E1_TIMESLOTS) + if (errno == ERANGE || res > NUM_E1_TS) return 0xff; return (uint8_t) res; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3bbfb6822d5595f9d243849141883490fa8037cb Gerrit-Change-Number: 20012 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:49:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:49:52 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: increase default number of virtual endpoints In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20013 ) Change subject: mgcp_trunk: increase default number of virtual endpoints ...................................................................... mgcp_trunk: increase default number of virtual endpoints The VTY default for the number of endpoints is 32. This is sufficient for small setups and lab testing, but for medium sized setupts the limit might be reached soon. Lets increase the default to 512 virtual endpoints. Change-Id: I55605ea083565b6950d0820e3f72c50c9dc19ffa Related: OS#4711 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 84ad220..8ff6f6a 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -50,7 +50,7 @@ trunk->audio_send_ptime = 1; trunk->audio_send_name = 1; - trunk->v.vty_number_endpoints = 32; + trunk->v.vty_number_endpoints = 512; trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I55605ea083565b6950d0820e3f72c50c9dc19ffa Gerrit-Change-Number: 20013 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:51:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:51:53 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: prioritize emergency calls over regular calls In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19793 ) Change subject: abis_rsl: prioritize emergency calls over regular calls ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Gerrit-Change-Number: 19793 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 07 Sep 2020 12:51:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:51:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:51:57 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: prioritize emergency calls over regular calls In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19793 ) Change subject: abis_rsl: prioritize emergency calls over regular calls ...................................................................... abis_rsl: prioritize emergency calls over regular calls when an emergency call arrives while all TCH are busy, the BSC should pick an arbitrary (preferably the longest lasting) call / lchan and release it in favor of the incoming emergancy call. The release of the existing call is a process that can not be done synchronously while the ChanRQD is handled sonce multiple messages are exchanged between BTS and MSC and multiple FSMs need to do their work. To be able to release one lchan while handling a ChanRQD a queue is implemented in which the incomming channel requests are collected. If an emergency call is established while all channels are busy, an arbitrary lchan is picked and freed. When freeing the lchan is done, the queue is checked again and the emergency call is put on the free lchan (TCH/H or TCH/F). Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Related: OS#4549 --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_fsm.h M include/osmocom/bsc/lchan_select.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_select.c 8 files changed, 284 insertions(+), 50 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 2611a3d..9879497 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -118,5 +118,7 @@ int rsl_tx_rf_chan_release(struct gsm_lchan *lchan); +void abis_rsl_chan_rqd_queue_poll(struct gsm_bts *bts); + #endif /* RSL_MT_H */ diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index a50c70e..7f36904 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -634,6 +634,7 @@ struct osmo_timer_list etws_timer; /* when to stop ETWS PN */ struct llist_head oml_fail_rep; + struct llist_head chan_rqd_queue; }; #define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index df3ed22..9fe7db1 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -74,3 +74,5 @@ void lchan_forget_conn(struct gsm_lchan *lchan); void lchan_set_last_error(struct gsm_lchan *lchan, const char *fmt, ...); + +void lchan_fsm_skip_error(struct gsm_lchan *lchan); diff --git a/include/osmocom/bsc/lchan_select.h b/include/osmocom/bsc/lchan_select.h index 865181b..41e7015 100644 --- a/include/osmocom/bsc/lchan_select.h +++ b/include/osmocom/bsc/lchan_select.h @@ -4,3 +4,4 @@ struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t type); struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts, enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate); +struct gsm_lchan *lchan_avail_by_type(struct gsm_bts *bts, enum gsm_chan_t type); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 03d53c5..74cc760 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1330,77 +1330,258 @@ return rsl_send_imm_ass_rej(bts, rqd_ref, wait_ind); } +struct chan_rqd { + struct llist_head entry; + struct gsm_bts *bts; + struct gsm48_req_ref ref; + enum gsm_chreq_reason_t reason; + uint8_t ta; + /* set to true to mark that the release of the release_lchan is in progress */ + struct gsm_lchan *release_lchan; + time_t timestamp; +}; + /* Handle packet channel rach requests */ -static int rsl_rx_pchan_rqd(struct msgb *msg, struct gsm_bts *bts) +static int rsl_rx_pchan_rqd(struct chan_rqd *rqd) { - struct gsm48_req_ref *rqd_ref; - struct abis_rsl_dchan_hdr *rqd_hdr = msgb_l2(msg); - rqd_ref = (struct gsm48_req_ref *) &rqd_hdr->data[1]; - uint8_t ra = rqd_ref->ra; uint8_t t1, t2, t3; uint32_t fn; uint8_t rqd_ta; uint8_t is_11bit; /* Process rach request and forward contained information to PCU */ - if (ra == 0x7F) { + if (rqd->ref.ra == 0x7F) { is_11bit = 1; /* FIXME: Also handle 11 bit rach requests */ - LOGP(DRSL, LOGL_ERROR, "BTS %d eleven bit access burst not supported yet!\n",bts->nr); + LOGP(DRSL, LOGL_ERROR, "BTS %d eleven bit access burst not supported yet!\n",rqd->bts->nr); return -EINVAL; } else { is_11bit = 0; - t1 = rqd_ref->t1; - t2 = rqd_ref->t2; - t3 = rqd_ref->t3_low | (rqd_ref->t3_high << 3); + t1 = rqd->ref.t1; + t2 = rqd->ref.t2; + t3 = rqd->ref.t3_low | (rqd->ref.t3_high << 3); fn = (51 * ((t3-t2) % 26) + t3 + 51 * 26 * t1); - - rqd_ta = rqd_hdr->data[sizeof(struct gsm48_req_ref)+2]; + rqd_ta = rqd->ta; } - return pcu_tx_rach_ind(bts, rqd_ta, ra, fn, is_11bit, + return pcu_tx_rach_ind(rqd->bts, rqd_ta, rqd->ref.ra, fn, is_11bit, GSM_L1_BURST_TYPE_ACCESS_0); } +/* Protect against RACH DoS attack: If an excessive amount of RACH requests queues up it is likely that the current BTS + * is under RACH DoS attack. To prevent excessive memory usage, remove all expired or at least one of the oldest channel + * requests from the queue to prevent the queue from growing indefinetly. */ +static void reduce_rach_dos(struct gsm_bts *bts) +{ + int rlt = gsm_bts_get_radio_link_timeout(bts); + time_t timestamp_current = time(NULL); + struct chan_rqd *rqd; + struct chan_rqd *rqd_tmp; + unsigned int rqd_count = 0; + + /* Drop all expired channel requests in the list */ + llist_for_each_entry_safe(rqd, rqd_tmp, &bts->chan_rqd_queue, entry) { + /* If the channel request is older than the radio link timeout we drop it. This also means that the + * queue is under its overflow limit again. */ + if (timestamp_current - rqd->timestamp > rlt) + llist_del(&rqd->entry); + else + rqd_count++; + } + + /* If we find more than 255 (256) unexpired channel requests in the queue it is very likely that there is a + * problem with RACH dos on this BTS. We drop the first entry in the list to clip the growth of the list. */ + if (rqd_count > 255) { + LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: more than 255 queued RACH requests -- RACH DoS attack?\n"); + llist_del(&llist_first_entry(&bts->chan_rqd_queue, struct chan_rqd, entry)->entry); + } +} + /* MS has requested a channel on the RACH */ static int rsl_rx_chan_rqd(struct msgb *msg) { - struct lchan_activate_info info; struct e1inp_sign_link *sign_link = msg->dst; struct gsm_bts *bts = sign_link->trx->bts; struct abis_rsl_dchan_hdr *rqd_hdr = msgb_l2(msg); - struct gsm48_req_ref *rqd_ref; - enum gsm_chan_t lctype; - enum gsm_chreq_reason_t chreq_reason; - struct gsm_lchan *lchan; - uint8_t rqd_ta; + struct chan_rqd *rqd; + + reduce_rach_dos(bts); + + rqd = talloc_zero(bts, struct chan_rqd); + OSMO_ASSERT(rqd); + + rqd->bts = bts; + rqd->timestamp = time(NULL); /* parse request reference to be used in immediate assign */ - if (rqd_hdr->data[0] != RSL_IE_REQ_REFERENCE) + if (rqd_hdr->data[0] != RSL_IE_REQ_REFERENCE) { + talloc_free(rqd); return -EINVAL; - - rqd_ref = (struct gsm48_req_ref *) &rqd_hdr->data[1]; + } + memcpy(&rqd->ref, &rqd_hdr->data[1], sizeof(rqd->ref)); /* parse access delay and use as TA */ - if (rqd_hdr->data[sizeof(struct gsm48_req_ref)+1] != RSL_IE_ACCESS_DELAY) + if (rqd_hdr->data[sizeof(struct gsm48_req_ref)+1] != RSL_IE_ACCESS_DELAY) { + talloc_free(rqd); return -EINVAL; - rqd_ta = rqd_hdr->data[sizeof(struct gsm48_req_ref)+2]; + } + rqd->ta = rqd_hdr->data[sizeof(struct gsm48_req_ref)+2]; /* Determine channel request cause code */ - chreq_reason = get_reason_by_chreq(rqd_ref->ra, bts->network->neci); + rqd->reason = get_reason_by_chreq(rqd->ref.ra, bts->network->neci); LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", - get_value_string(gsm_chreq_descs, chreq_reason), rqd_ref->ra, bts->network->neci, chreq_reason); + get_value_string(gsm_chreq_descs, rqd->reason), rqd->ref.ra, bts->network->neci, rqd->reason); - /* Handle PDCH related rach requests (in case of BSC-co-located-PCU */ - if (chreq_reason == GSM_CHREQ_REASON_PDCH) - return rsl_rx_pchan_rqd(msg, bts); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_TOTAL]); + + /* Enqueue request */ + llist_add_tail(&rqd->entry, &bts->chan_rqd_queue); + + /* Forward the request directly. Most request will be finished with one attempt so no queuing will be + * necessary. */ + abis_rsl_chan_rqd_queue_poll(bts); + + return 0; +} + +/* Find any busy TCH/H or TCH/F lchan */ +static struct gsm_lchan *get_any_lchan(struct gsm_bts *bts) +{ + int trx_nr; + int ts_nr; + struct gsm_bts_trx *trx; + struct gsm_bts_trx_ts *ts; + struct gsm_lchan *lchan_est = NULL; + struct gsm_lchan *lchan_any = NULL; + struct gsm_lchan *lchan; + + for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { + trx = gsm_bts_trx_num(bts, trx_nr); + for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { + ts = &trx->ts[ts_nr]; + ts_for_each_lchan(lchan, ts) { + if (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H) { + if (bts->chan_alloc_reverse) { + if (lchan->fi->state == LCHAN_ST_ESTABLISHED) + lchan_est = lchan; + else + lchan_any = lchan; + } else { + if (lchan->fi->state == LCHAN_ST_ESTABLISHED) { + if (!lchan_est) + lchan_est = lchan; + } else { + if (!lchan_any) + lchan_any = lchan; + } + } + } + } + } + } + + if (lchan_est) + return lchan_est; + else if (lchan_any) + return lchan_any; + return NULL; +} + +/* Ensure that an incoming emergency call gets priority, if all voice channels are busy, terminate one regular call. + * Return true if freeing of a busy lchan is in progress, but not done yet, return false when done (either successfully + * or unsuccessfully). */ +static bool force_free_lchan_for_emergency(struct chan_rqd *rqd) +{ + /* If the request is not about an emergency call, we may exit early, without doing anything. */ + if (rqd->reason != GSM_CHREQ_REASON_EMERG) + return false; + + /* First check the situation on the BTS, if we have TCH/H or TCH/F resources available for another (EMERGENCY) + * call. If yes, then no (further) action has to be carried out. */ + if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_F)) { + LOG_BTS(rqd->bts, DRSL, LOGL_NOTICE, + "CHAN RQD/EMERGENCY-PRIORITY: at least one TCH/F is (now) available!\n"); + return false; + } + if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_H)) { + LOG_BTS(rqd->bts, DRSL, LOGL_NOTICE, + "CHAN RQD/EMERGENCY-PRIORITY: at least one TCH/H is (now) available!\n"); + return false; + } + + /* No free TCH/F or TCH/H was found, we now select one of the busy lchans and initate a release on that lchan. + * This will take a short amount of time. We need to come back and check regulary to see if we managed to + * free up another lchan. */ + if (!rqd->release_lchan) { + /* Pick any busy TCH/F or TCH/H lchan and inititate a channel + * release to make room for the incoming emergency call */ + rqd->release_lchan = get_any_lchan(rqd->bts); + if (!rqd->release_lchan) { + /* It can not happen that we first find out that there + * is no TCH/H or TCH/F available and at the same time + * we ware unable to find any busy TCH/H or TCH/F. In + * this case, the BTS probably does not have any + * voice channels configured? */ + LOG_BTS(rqd->bts, DRSL, LOGL_NOTICE, + "CHAN RQD/EMERGENCY-PRIORITY: no TCH/H or TCH/F available - check VTY config!\n"); + return false; + } + + LOG_BTS(rqd->bts, DRSL, LOGL_NOTICE, + "CHAN RQD/EMERGENCY-PRIORITY: inducing termination of lchan %s (state:%s) in favor of incoming EMERGENCY CALL!\n", + gsm_lchan_name(rqd->release_lchan), osmo_fsm_inst_state_name(rqd->release_lchan->fi)); + + lchan_release(rqd->release_lchan, !!(rqd->release_lchan->conn), true, 0); + } else { + /* BTS is shutting down, give up... */ + if (rqd->release_lchan->ts->fi->state == TS_ST_NOT_INITIALIZED) + return false; + + OSMO_ASSERT(rqd->release_lchan->fi); + + LOG_BTS(rqd->bts, DRSL, LOGL_NOTICE, + "CHAN RQD/EMERGENCY-PRIORITY: still terminating lchan %s (state:%s) in favor of incoming EMERGENCY CALL!\n", + gsm_lchan_name(rqd->release_lchan), osmo_fsm_inst_state_name(rqd->release_lchan->fi)); + + /* If the channel was released in error (not established), the + * lchan FSM automatically blocks the LCHAN for a short time. + * This is not acceptable in an emergency situation, so we skip + * this waiting period. */ + if (rqd->release_lchan->fi->state == LCHAN_ST_WAIT_AFTER_ERROR) + lchan_fsm_skip_error(rqd->release_lchan); + } + + /* We are still in the process of releasing a busy lchan in favvor of the incoming emergency call. */ + return true; +} + +void abis_rsl_chan_rqd_queue_poll(struct gsm_bts *bts) +{ + struct lchan_activate_info info; + enum gsm_chan_t lctype; + struct gsm_lchan *lchan = NULL; + struct chan_rqd *rqd; + + rqd = llist_first_entry_or_null(&bts->chan_rqd_queue, struct chan_rqd, entry); + if (!rqd) + return; + + /* Handle PDCH related rach requests (in case of BSC-co-located-PCU) */ + if (rqd->reason == GSM_CHREQ_REASON_PDCH) { + rsl_rx_pchan_rqd(rqd); + return; + } + + /* Ensure that emergency calls will get priority over regular calls, however releasing + * lchan in favor of an emergency call may take some time, so we exit here. The lchan_fsm + * will poll again when an lchan becomes available. */ + if (force_free_lchan_for_emergency(rqd)) + return; /* determine channel type (SDCCH/TCH_F/TCH_H) based on * request reference RA */ - lctype = get_ctype_by_chreq(bts->network, rqd_ref->ra); - - rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_TOTAL]); + lctype = get_ctype_by_chreq(bts->network, rqd->ref.ra); /* check availability / allocate channel * @@ -1410,49 +1591,60 @@ * - If there is still no channel available, try a TCH/F. * */ - if (chreq_reason == GSM_CHREQ_REASON_EMERG) { + if (rqd->reason == GSM_CHREQ_REASON_EMERG) { if (bts->si_common.rach_control.t2 & 0x4) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD: MS attempts EMERGENCY CALL although EMERGENCY CALLS " "are not allowed in sysinfo (spec violation by MS!)\n"); - rsl_tx_imm_ass_rej(bts, rqd_ref); - return -EINVAL; + rsl_tx_imm_ass_rej(bts, &rqd->ref); + llist_del(&rqd->entry); + talloc_free(rqd); + return; } } - lchan = lchan_select_by_type(bts, GSM_LCHAN_SDCCH); + + /* Emergency calls will be put on a free TCH/H or TCH/F directly in the code below, all other channel requests + * will get an SDCCH first (if possible). */ + if (rqd->reason != GSM_CHREQ_REASON_EMERG) + lchan = lchan_select_by_type(bts, GSM_LCHAN_SDCCH); + if (!lchan) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD: no resources for %s 0x%x, retrying with %s\n", - gsm_lchant_name(GSM_LCHAN_SDCCH), rqd_ref->ra, gsm_lchant_name(GSM_LCHAN_TCH_H)); + gsm_lchant_name(GSM_LCHAN_SDCCH), rqd->ref.ra, gsm_lchant_name(GSM_LCHAN_TCH_H)); lchan = lchan_select_by_type(bts, GSM_LCHAN_TCH_H); } if (!lchan) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD: no resources for %s 0x%x, retrying with %s\n", - gsm_lchant_name(GSM_LCHAN_SDCCH), rqd_ref->ra, gsm_lchant_name(GSM_LCHAN_TCH_F)); + gsm_lchant_name(GSM_LCHAN_SDCCH), rqd->ref.ra, gsm_lchant_name(GSM_LCHAN_TCH_F)); lchan = lchan_select_by_type(bts, GSM_LCHAN_TCH_F); } if (!lchan) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD: no resources for %s 0x%x\n", - gsm_lchant_name(lctype), rqd_ref->ra); + gsm_lchant_name(lctype), rqd->ref.ra); rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_NO_CHANNEL]); - rsl_tx_imm_ass_rej(bts, rqd_ref); - return 0; + rsl_tx_imm_ass_rej(bts, &rqd->ref); + llist_del(&rqd->entry); + talloc_free(rqd); + return; } /* save the RACH data as we need it after the CHAN ACT ACK */ lchan->rqd_ref = talloc_zero(bts, struct gsm48_req_ref); OSMO_ASSERT(lchan->rqd_ref); - *(lchan->rqd_ref) = *rqd_ref; - lchan->rqd_ta = rqd_ta; + *(lchan->rqd_ref) = rqd->ref; + lchan->rqd_ta = rqd->ta; LOG_LCHAN(lchan, LOGL_DEBUG, "MS: Channel Request: reason=%s ra=0x%02x ta=%d\n", - gsm_chreq_name(chreq_reason), rqd_ref->ra, rqd_ta); + gsm_chreq_name(rqd->reason), rqd->ref.ra, rqd->ta); info = (struct lchan_activate_info){ .activ_for = FOR_MS_CHANNEL_REQUEST, .chan_mode = GSM48_CMODE_SIGN, }; lchan_activate(lchan, &info); - return 0; + llist_del(&rqd->entry); + talloc_free(rqd); + return; } int rsl_tx_imm_assignment(struct gsm_lchan *lchan) diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index a17143d..ce1b200 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -263,6 +263,7 @@ INIT_LLIST_HEAD(&bts->loc_list); INIT_LLIST_HEAD(&bts->local_neighbors); INIT_LLIST_HEAD(&bts->oml_fail_rep); + INIT_LLIST_HEAD(&bts->chan_rqd_queue); /* Enable all codecs by default. These get reset to a more fine grained selection IF a * 'codec-support' config appears in the config file (see bsc_vty.c). */ diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 115c3da..65d77c4 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -413,8 +413,24 @@ static void lchan_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; lchan_reset(lchan); osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_LCHAN_UNUSED, lchan); + + /* Poll the channel request queue, so that waiting calls can make use of the lchan that just + * has become unused now. */ + abis_rsl_chan_rqd_queue_poll(bts); +} + +static void lchan_fsm_wait_after_error_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; + + /* We also need to poll the channel request queue when the FSM enters the WAIT_AFTER_ERROR + * state. In case of an emergency call the channel request queue will skip the waiting + * period. */ + abis_rsl_chan_rqd_queue_poll(bts); } /* Configure the multirate setting on this channel. */ @@ -1429,6 +1445,7 @@ }, [LCHAN_ST_WAIT_AFTER_ERROR] = { .name = "WAIT_AFTER_ERROR", + .onenter = lchan_fsm_wait_after_error_onenter, .in_event_mask = 0 | S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */ , @@ -1496,6 +1513,13 @@ } } +void lchan_fsm_skip_error(struct gsm_lchan *lchan) +{ + struct osmo_fsm_inst *fi = lchan->fi; + if (fi->state == LCHAN_ST_WAIT_AFTER_ERROR) + lchan_fsm_state_chg(LCHAN_ST_UNUSED); +} + static int lchan_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index d2dba1b..6d3caac 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -162,15 +162,12 @@ return lchan_select_by_type(bts, type); } -/* Return a matching lchan from a specific BTS that is currently available. The next logical step is - * lchan_activate() on it, which would possibly cause dynamic timeslot pchan switching, taken care of by - * the lchan and timeslot FSMs. */ -struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t type) +struct gsm_lchan *lchan_avail_by_type(struct gsm_bts *bts, enum gsm_chan_t type) { struct gsm_lchan *lchan = NULL; enum gsm_phys_chan_config first, first_cbch, second, second_cbch; - LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_select_by_type(%s)\n", gsm_lchant_name(type)); + LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_avail_by_type(%s)\n", gsm_lchant_name(type)); switch (type) { case GSM_LCHAN_SDCCH: @@ -231,6 +228,20 @@ LOG_BTS(bts, DRLL, LOGL_ERROR, "Unknown gsm_chan_t %u\n", type); } + return lchan; +} + +/* Return a matching lchan from a specific BTS that is currently available. The next logical step is + * lchan_activate() on it, which would possibly cause dynamic timeslot pchan switching, taken care of by + * the lchan and timeslot FSMs. */ +struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t type) +{ + struct gsm_lchan *lchan = NULL; + + lchan = lchan_avail_by_type(bts, type); + + LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_select_by_type(%s)\n", gsm_lchant_name(type)); + if (lchan) { lchan->type = type; LOG_LCHAN(lchan, LOGL_INFO, "Selected\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8651265928797dbda9f528b544931dcfa4a0b36 Gerrit-Change-Number: 19793 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:52:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:52:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 ) Change subject: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 07 Sep 2020 12:52:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:53:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:53:30 +0000 Subject: Change in osmo-bsc[master]: Fix creating MGCP proxy socket if MGW listens on an IPv6 address In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19921 ) Change subject: Fix creating MGCP proxy socket if MGW listens on an IPv6 address ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide88c7358a38702ef11c84145518794e75870ef8 Gerrit-Change-Number: 19921 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Mon, 07 Sep 2020 12:53:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:53:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:53:50 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19954 ) Change subject: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Mon, 07 Sep 2020 12:53:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:53:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 7 Sep 2020 12:53:54 +0000 Subject: Change in osmo-bsc[master]: Fix creating MGCP proxy socket if MGW listens on an IPv6 address In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19921 ) Change subject: Fix creating MGCP proxy socket if MGW listens on an IPv6 address ...................................................................... Fix creating MGCP proxy socket if MGW listens on an IPv6 address If for instance "mgw remote-ip ::1" is configured, the MGCP IPA proxy socket towards the MGW will use ::1 as the destination address, but it was being created as AF_INET. Let's use AF_UNSPEC instead and let osmo_sock_init2 decide the best socket type to create. Moreover, change the default local address from "0.0.0.0" to NULL to also let osmo_sock_init2 pick an IPv6 address if necessary. Change-Id: Ide88c7358a38702ef11c84145518794e75870ef8 --- M src/osmo-bsc/osmo_bsc_msc.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index b1bb245..26d2bc8 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -164,7 +164,7 @@ else mgw_port = MGCP_CLIENT_REMOTE_PORT_DEFAULT; - rc = osmo_sock_init2_ofd(&msc->mgcp_ipa.ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, + rc = osmo_sock_init2_ofd(&msc->mgcp_ipa.ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, msc->mgcp_ipa.local_addr, msc->mgcp_ipa.local_port, net->mgw.conf->remote_addr, mgw_port, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); @@ -256,7 +256,7 @@ msc_data->audio_support[4]->hr = 1; osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, OSMO_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); - msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0"); + msc_data->mgcp_ipa.local_addr = NULL; /* = INADDR(6)_ANY */ msc_data->mgcp_ipa.local_port = 0; /* dynamic */ msc_data->nri_ranges = osmo_nri_ranges_alloc(msc_data); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide88c7358a38702ef11c84145518794e75870ef8 Gerrit-Change-Number: 19921 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 12:55:37 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 7 Sep 2020 12:55:37 +0000 Subject: Change in osmo-sip-connector[master]: Revert "sip: Specify invite contact tag" In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 ) Change subject: Revert "sip: Specify invite contact tag" ...................................................................... Patch Set 1: Code-Review+1 > It may be worth considering holding > on merging this revert until there is a clear path forward on that > end. I can patch my local build, but anyone else using freeswitch > with osmo-sip-connector will run into the same problem. I'll get around to looking at this eventually, but I just wanted to add a note here, that I am intending to fall back and use either FS 1.6 or 1.8 for the time being. The current FS HEAD development is way too unstable for production. THerefore (even though this is already merged) +! -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/19992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I712f17fecbc372d1e486e80673a548e281b37800 Gerrit-Change-Number: 19992 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Mon, 07 Sep 2020 12:55:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 14:22:29 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 14:22:29 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: Hello pespin, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19416 to look at the new patch set (#20). Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... add osmo_sockaddr_local_ip() to determine the local address for a remote. Similiar to osmo_sock_local_ip but for osmo_sockaddr. Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/19416/20 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 14:22:46 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 14:22:46 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... Patch Set 20: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19416/19/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19416/19/src/socket.c at 1684 PS19, Line 1684: if (rc < 0) > Ack Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 14:22:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 14:31:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 14:31:04 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... Patch Set 20: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 14:31:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 14:31:07 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 14:31:07 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 22: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 25 PS22, Line 25: enum gprs_ns2_signal_ns { : S_NSVC_RESET, /* when a NSVC is in reset */ : S_NSVC_BLOCK, /* when a NSVC become blocked */ : S_NSVC_UNBLOCK, /* when a NSVC become unblocked */ : S_NSVC_ALIVE_EXP, /* Tns-alive expired more than N times */ : S_NSVC_REPLACED, /* nsvc object is replaced (sets old_nsvc) */ : S_NSVC_MISMATCH, /* got an unexpected IE (sets msg, pdu_type, ie_type) */ : S_NSVC_DELETED, /* when a NSVC gets deleted */ : S_SNS_CONFIGURED, /* IP-SNS configuration completed */ : S_NSE_AVAILABLE, /* NSE is available */ : S_NSE_UNAVAILABLE, /* NSE is unavailable */ : }; : : struct gprs_ns2_signal_data { : struct gprs_ns2_nse *nse; : uint16_t nsei; : struct gprs_ns2_vc *nsvc; : struct gprs_ns2_vc *old_nsvc; : uint8_t cause; : uint8_t pdu_type; : uint8_t ie_type; : struct msgb *msg; : }; : : enum gprs_ns2_vc_mode { : NS2_VC_MODE_ALIVE, /* The VC will use RESET/BLOCK/UNBLOCK to start the connection and do ALIVE/ACK */ : NS2_VC_MODE_BLOCKRESET, /* The will only use ALIVE/ACK no initiation */ : }; : : /*! Osmoco NS events */ : enum gprs_ns2_evt { : GPRS_NS_EVT_UNIT_DATA, : }; : : /* callbacks for messages transfer */ : /*! Osmocom GPRS callback function type */ : typedef int gprs_ns2_cb_t(enum gprs_ns2_evt event, struct msgb *msg, : uint16_t nsei, uint16_t bvci); > I know this patch has been very long in the pipeline already. [?] I agree. I wasn't sure if it would be good to add even more time into it. https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 86 PS22, Line 86: int gprs_ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause); : int gprs_ns2_tx_block_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause); : int gprs_ns2_tx_reset_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_unblock(struct gprs_ns2_vc *nsvc); : int gprs_ns2_tx_unblock_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_alive(struct gprs_ns2_vc *nsvc); : int gprs_ns2_tx_alive_ack(struct gprs_ns2_vc *nsvc); > I think those low-level functions may not actually need to be exposed. [?] Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 104 PS22, Line 104: nt gprs_ns2_tx_sns_ack(struct gprs_ns2_vc *nsvc, uint8_t trans_id, uint8_t *cause, : const struct gprs_ns_ie_ip4_elem *ip4_elems, : unsigned int num_ip4_elems, : const struct gprs_ns_ie_ip6_elem *ip6_elems, : unsigned int num_ip6_elems); : int gprs_ns2_tx_sns_config(struct gprs_ns2_vc *nsvc, bool end_flag, : const struct gprs_ns_ie_ip4_elem *ip4_elems, : unsigned int num_ip4_elems, : const struct gprs_ns_ie_ip6_elem *ip6_elems, : unsigned int num_ip6_elems); : int gprs_ns2_tx_sns_config_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); : int gprs_ns2_tx_sns_size(struct gprs_ns2_vc *nsvc, bool reset_flag, uint16_t max_nr_nsvc, : int ip4_ep_nr, int ip6_ep_nr); : int gprs_ns2_tx_sns_size_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); > likewise all of those above. Those should be internal low-level functions inside the NS stack. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 22 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 14:31:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 14:32:16 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 14:32:16 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... add osmo_sockaddr_local_ip() to determine the local address for a remote. Similiar to osmo_sock_local_ip but for osmo_sockaddr. Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 25 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index e417f42..47a372c 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -113,6 +113,8 @@ int osmo_sock_local_ip(char *local_ip, const char *remote_ip); +int osmo_sockaddr_local_ip(struct osmo_sockaddr *local_ip, + const struct osmo_sockaddr *remote_ip); int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b); #endif /* (!EMBEDDED) */ diff --git a/src/socket.c b/src/socket.c index 803af31..f078242 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1662,6 +1662,29 @@ return 0; } +/*! Determine the matching local address for a given remote address. + * \param[out] local_ip caller provided memory for resulting local address + * \param[in] remote_ip remote address + * \returns 0 on success; negative otherwise + */ +int osmo_sockaddr_local_ip(struct osmo_sockaddr *local_ip, const struct osmo_sockaddr *remote_ip) +{ + int sfd; + int rc; + socklen_t local_ip_len; + + sfd = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP, NULL, remote_ip, OSMO_SOCK_F_CONNECT); + if (sfd < 0) + return -EINVAL; + + memset(local_ip, 0, sizeof(*local_ip)); + local_ip_len = sizeof(*local_ip); + rc = getsockname(sfd, (struct sockaddr *)local_ip, &local_ip_len); + close(sfd); + + return rc; +} + /*! Compare two osmo_sockaddr. * \param[in] a * \param[in] b -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 20 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 17:01:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 7 Sep 2020 17:01:46 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support In-Reply-To: References: Message-ID: Hello dexter, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 to look at the new patch set (#2). Change subject: mgw: Initial IPv6 support ...................................................................... mgw: Initial IPv6 support This commit contains the bulky work of moving all address parsing to support IPv6 together with IPv4. Some specific patches required for full IPv6+IPv4 support requiring behavioral changes come after this one. Full Osmux IPv6 support is left out of the scope of this patch. Depends: libosmocore.git Ie07a38b05b7888885dba4ae795e9f3d9a561543d (> 1.4.0) Depends: libosmocore.git I59bf4b4b3ed14766a5a5285923d1ffa9fc8b2294 (> 1.4.0) Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c M tests/mgcp/mgcp_test.c 12 files changed, 281 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/19969/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 19:47:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 19:47:45 +0000 Subject: Change in osmo-pcu[master]: encoding: use CSN.1 codec to generate Packet Uplink Assignment In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19787 to look at the new patch set (#4). Change subject: encoding: use CSN.1 codec to generate Packet Uplink Assignment ...................................................................... encoding: use CSN.1 codec to generate Packet Uplink Assignment It's quite odd to see that in write_packet_downlink_assignment() we initialize an 'RlcMacDownlink_t', so then the caller can use the power of CSN.1 codec to generate the final sequence of bytes to be transmitted, while in write_packet_uplink_assignment() we already compose the final RLC/MAC message straight away using the low-level bitvec API (like bitvec_write_field()). I guess the reason is that at the time of writing this code, the CSN.1 codec was not stable enough, so it was safer to generate the message 'by hand'. This would also explain why we *decode* the final RLC/MAC message in create_ul_ass() right after encoding. Rewrite write_packet_uplink_assignment(), so now it initializes a caller-provided 'RlcMacDownlink_t' structure. Given that it's allocated on heap using talloc_zero(), do not initialize presence indicators of fields that are not present in the message. This would facilitate handling of frequency hopping parameters in the upcoming changes, in particular we can now introduce a function that would compose Frequency Parameters IE for both write_packet_{downlink,uplink}_assignment(). Tested manually by running a GPRS-enabled network, as well as by running test cases from ttcn3-pcu-test => no regressions observed. Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Related: SYS#4868, OS#4547 --- M src/encoding.cpp M src/encoding.h M src/tbf.cpp 3 files changed, 108 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/87/19787/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Gerrit-Change-Number: 19787 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 19:47:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 19:47:45 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 to look at the new patch set (#4). Change subject: encoding: implement handing of hopping parameters ...................................................................... encoding: implement handing of hopping parameters The following test cases verify coding of the hopping parameters: + (RR) Immediate Assignment - TC_pcuif_fh_imm_ass_ul_egprs, - TC_pcuif_fh_imm_ass_ul, - TC_pcuif_fh_imm_ass_dl, + (RLC/MAC) Packet Uplink/Downlink Assignment: - TC_pcuif_fh_pkt_ass_ul, - TC_pcuif_fh_pkt_ass_dl, all of them pass with this (and the upcoming) change applied. Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Related: SYS#4868, OS#4547 --- M src/encoding.cpp M src/pdch.h 2 files changed, 71 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/19788/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 19:47:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 19:47:47 +0000 Subject: Change in osmo-pcu[master]: encoding: clarify docstring for write_packet_downlink_assignment() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20014 ) Change subject: encoding: clarify docstring for write_packet_downlink_assignment() ...................................................................... encoding: clarify docstring for write_packet_downlink_assignment() Change-Id: I7c4458c2e7767b6cf03462ba79acdd9c9904ee83 --- M src/encoding.cpp 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/20014/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 76a1cec..2cee251 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -628,15 +628,14 @@ } -/* generate downlink assignment */ +/* Generate Packet Downlink Assignment as per 3GPP TS 44.060, section 11.2.7. + * NOTE: 'block' is expected to be zero-initialized by the caller. */ void Encoding::write_packet_downlink_assignment(RlcMacDownlink_t * block, bool old_tfi_is_valid, uint8_t old_tfi, uint8_t old_downlink, const struct gprs_rlcmac_dl_tbf *tbf, uint8_t poll, uint8_t rrbp, uint8_t alpha, uint8_t gamma, int8_t ta_idx, uint8_t ta_ts, bool use_egprs) { - // Packet downlink assignment TS 44.060 11.2.7 - PDA_AdditionsR99_t *pda_r99; uint8_t tn; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c4458c2e7767b6cf03462ba79acdd9c9904ee83 Gerrit-Change-Number: 20014 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 19:48:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 7 Sep 2020 19:48:14 +0000 Subject: Change in osmo-pcu[master]: encoding: use CSN.1 codec to generate Packet Uplink Assignment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19787 ) Change subject: encoding: use CSN.1 codec to generate Packet Uplink Assignment ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19787/2/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19787/2/src/encoding.cpp at 538 PS2, Line 538: /* generate uplink assignment */ > May be good idea documenting that "block" should be zero initialized by the caller. Done, see also https://gerrit.osmocom.org/c/osmo-pcu/+/20014. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Gerrit-Change-Number: 19787 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 07 Sep 2020 19:48:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 7 22:23:32 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 7 Sep 2020 22:23:32 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#23). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,139 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/23 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 23 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 8 01:37:15 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 08 Sep 2020 01:37:15 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f56e0546ac14_12d02af35bf545f0152952e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 155s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 155s] [COMPILING libboard/qmod/source/card_pres.c] [ 156s] [COMPILING libboard/qmod/source/wwan_led.c] [ 156s] [COMPILING libboard/qmod/source/i2c.c] [ 156s] [COMPILING libboard/qmod/source/board_qmod.c] [ 156s] [COMPILING apps/dfu/main.c] [ 156s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 156s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 156s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 157s] Memory region Used Size Region Size %age Used [ 157s] rom: 16588 B 16 KB 101.25% [ 157s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 157s] collect2: error: ld returned 1 exit status [ 157s] % [ 157s] make[2]: *** [Makefile:234: flash] Error 1 [ 157s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 157s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 157s] dh_auto_build: error: make -j1 returned exit code 2 [ 157s] make: *** [debian/rules:16: build] Error 25 [ 157s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 157s] ### VM INTERACTION START ### [ 160s] [ 151.117648] sysrq: Power Off [ 160s] [ 151.121447] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] lamb52 failed "build simtrace2_0.7.0.63.39070.dsc" at Tue Sep 8 01:37:04 UTC 2020. [ 160s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Sep 8 07:21:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 07:21:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 ) Change subject: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE ...................................................................... library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE We use MSB ordering in this file: } with { encode "RAW" ; variant "FIELDORDER(msb)" } but both fields were placed in LSB order. See 3GPP TS 49.031, figure 8.3.6-1 for more details. Change-Id: Ie9bbf99df0b189846c8ea3159bfd3c9a0ee5df2a Related: OS#4597 --- M library/BSSAP_LE_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/20015/1 diff --git a/library/BSSAP_LE_Types.ttcn b/library/BSSAP_LE_Types.ttcn index ae7385b..9bfedc0 100644 --- a/library/BSSAP_LE_Types.ttcn +++ b/library/BSSAP_LE_Types.ttcn @@ -572,8 +572,8 @@ } type record PDU_BSSAP_LE { - BIT1 discriminator, // 0 = BSSMAP-LE; 1 = DTAP-LE BIT7 spare, // always '0000000'B + BIT1 discriminator, // 0 = BSSMAP-LE; 1 = DTAP-LE OCT1 dlci optional, LIN1 lengthIndicator, BSSMAPLEorDTAP pdu -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie9bbf99df0b189846c8ea3159bfd3c9a0ee5df2a Gerrit-Change-Number: 20015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 07:21:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 07:21:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 ) Change subject: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes ...................................................................... library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes Otherwise TITAN would refuse to decode any messages: Dynamic test case error: While RAW-decoding type '@BSSAP_LE_Types.PDU_BSSAP_LE': Can not decode type '@BSSAP_LE_Types.PDU_BSSAP_LE', because invalid message was received Change-Id: I3db7e8784efd067ccf0bc7dbc234d9b4ff1c033c Related: OS#4597 --- M library/BSSAP_LE_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/20016/1 diff --git a/library/BSSAP_LE_Types.ttcn b/library/BSSAP_LE_Types.ttcn index 9bfedc0..a929722 100644 --- a/library/BSSAP_LE_Types.ttcn +++ b/library/BSSAP_LE_Types.ttcn @@ -34,7 +34,7 @@ BSSMAP_LE_RESET ('00110000'B), BSSMAP_LE_RESET_ACK ('00110001'B) -}; +} with { variant "FIELDLENGTH(8)" }; /* TS 49.031 Section 10.2 */ type enumerated BSSMAP_LE_IEI { @@ -78,7 +78,7 @@ BSSMAP_LE_IEI_SHORT_ID ('10001110'B), BSSMAP_LE_IEI_COVERAGE_CLASS ('10001111'B), BSSMAP_LE_IEI_MTA_ACC_SEC_RQD ('10010000'B) -}; +} with { variant "FIELDLENGTH(8)" }; /* Section 9.1 */ type record BSSMAP_LE_PerfLocReq { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3db7e8784efd067ccf0bc7dbc234d9b4ff1c033c Gerrit-Change-Number: 20016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 08:30:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 08:30:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 ) Change subject: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3db7e8784efd067ccf0bc7dbc234d9b4ff1c033c Gerrit-Change-Number: 20016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 08 Sep 2020 08:30:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 08:31:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 08:31:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 ) Change subject: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE ...................................................................... Patch Set 1: I think neels locally removed the global FIELDORDER("msb") from the file in his branch, so we have to decide if we keep the global fieldorder and re-order this one, or we change it globally which may have fall-out elsewhere -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie9bbf99df0b189846c8ea3159bfd3c9a0ee5df2a Gerrit-Change-Number: 20015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 08 Sep 2020 08:31:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 08:34:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 08:34:24 +0000 Subject: Change in osmo-pcu[master]: encoding: clarify docstring for write_packet_downlink_assignment() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20014 ) Change subject: encoding: clarify docstring for write_packet_downlink_assignment() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c4458c2e7767b6cf03462ba79acdd9c9904ee83 Gerrit-Change-Number: 20014 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 08:34:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 08:35:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 08:35:08 +0000 Subject: Change in osmo-pcu[master]: encoding: use CSN.1 codec to generate Packet Uplink Assignment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19787 ) Change subject: encoding: use CSN.1 codec to generate Packet Uplink Assignment ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Gerrit-Change-Number: 19787 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 08:35:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 08:35:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 08:35:42 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19788 ) Change subject: encoding: implement handing of hopping parameters ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 08:35:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:05:19 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Tue, 8 Sep 2020 09:05:19 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages References: Message-ID: matt9j has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 ) Change subject: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages ...................................................................... ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages Change-Id: Ib1be00f73146519c8cc78bb08dd26a110771cd55 --- M src/ipa_proto.erl 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/17/20017/1 diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index 9a3f3d0..20e5a1b 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -261,15 +261,15 @@ end. % Respond with PONG to PING -process_ccm_msg(Socket, StreamID, ?IPAC_MSGT_PING, _) -> +process_ccm_msg(Socket, StreamID, ping, _) -> io:format("Socket ~p Stream ~p: PING -> PONG~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_ACK with ID_ACK -process_ccm_msg(Socket, StreamID, ?IPAC_MSGT_ID_ACK, _) -> +process_ccm_msg(Socket, StreamID, id_ack, _) -> io:format("Socket ~p Stream ~p: ID_ACK -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_RESP with ID_ACK -process_ccm_msg(Socket, StreamID, ?IPAC_MSGT_ID_RESP, _) -> +process_ccm_msg(Socket, StreamID, id_resp, _) -> io:format("Socket ~p Stream ~p: ID_RESP -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Default message handler for unknown messages @@ -279,7 +279,7 @@ % process an incoming CCM message (Stream ID 254) process_rx_ccm_msg(Socket, StreamID, PayloadBin) -> - [MsgType|Opts] = binary:bin_to_list(PayloadBin), + {MsgType, Opts} = ipa_proto_ccm:decode(PayloadBin), process_ccm_msg(Socket, StreamID, MsgType, Opts). send_ccm_id_get(Socket) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib1be00f73146519c8cc78bb08dd26a110771cd55 Gerrit-Change-Number: 20017 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:05:20 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Tue, 8 Sep 2020 09:05:20 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options References: Message-ID: matt9j has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 ) Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... ipa_proto: Implement ccm response with variable options This commit allows configuration of the ccm protocol options used when setting up an ipa connection with an external entity. The options record is kept alongside the socket in the socket-owning process loop, and used to fill the values in the ccm identity response. If additional CCM state were needed in the future this commit could be extended to keep generic state, with the options only representing one piece of the overall state. Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a --- A include/ipa.hrl M src/ipa_proto.erl 2 files changed, 84 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/18/20018/1 diff --git a/include/ipa.hrl b/include/ipa.hrl new file mode 100644 index 0000000..352057f --- /dev/null +++ b/include/ipa.hrl @@ -0,0 +1,32 @@ +% (C) 2020 by Matt Johnson +% +% 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. + +-ifndef(IPA). +-define(IPA, true). + +-record(ipa_ccm_options, {serial_number, + unit_id, + mac_address, + location, + unit_type, + equipment_version, + sw_version, + unit_name + }). + +-endif. diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index 20e5a1b..18b74bd 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -23,6 +23,8 @@ -author('Harald Welte '). -compile(export_all). +-include("ipa.hrl"). + -define(TIMEOUT, 1000). -define(IPA_SOCKOPTS, [binary, {packet, 0}, {reuseaddr, true}, {active, false}]). @@ -91,6 +93,10 @@ controlling_process(Socket, StreamID, NewPid) -> call_sync_sock(Socket, {ipa_ctrl_proc, Socket, StreamID, NewPid}). +% Set the metadata required for the ipa CCM sub-protocol. +set_ccm_options(Socket, CcmOptions) -> + call_sync_sock(Socket, {ipa_set_ccm_options, Socket, CcmOptions}). + % unblock the socket from further processing unblock(Socket) -> send_ccm_id_get(Socket), @@ -113,6 +119,11 @@ [IpaSock] = ets:lookup(ipa_sockets, Socket), ets:delete(IpaSock#ipa_socket.streamTbl, {Socket, StreamID}), ets:insert_new(IpaSock#ipa_socket.streamTbl, {{Socket, StreamID}, NewPid}); +% server-side handler for set_ccm_options() +% set ccm protocol metadata options reported with connection setup. +request({ipa_set_ccm_options, Socket, CcmOptions}) -> + io:format("Setting ccm options for socket ~p to ~p~n", [Socket, CcmOptions]), + {ccm_options, CcmOptions}; % server-side handler for unblock() request({ipa_unblock, Socket}) -> io:format("Unblocking socket ~p~n", [Socket]), @@ -167,20 +178,20 @@ end. % process (split + deliver) an incoming IPA message -process_rx_ipa_msg(_S, _StreamMap, <<>>) -> +process_rx_ipa_msg(_S, _StreamMap, _, <<>>) -> ok; -process_rx_ipa_msg(S, StreamMap, Data) -> +process_rx_ipa_msg(S, StreamMap, CcmOptions, Data) -> {StreamID, PayloadBin, Trailer} = split_ipa_msg(Data), case StreamID of ?IPAC_PROTO_CCM -> - process_rx_ccm_msg(S, StreamID, PayloadBin); + process_rx_ccm_msg(S, StreamID, CcmOptions, PayloadBin); ?IPAC_PROTO_OSMO -> <> = PayloadBin, deliver_rx_ipa_msg(S, {osmo, ExtStreamID}, StreamMap, PayloadExt); _ -> deliver_rx_ipa_msg(S, StreamID, StreamMap, PayloadBin) end, - process_rx_ipa_msg(S, StreamMap, Trailer). + process_rx_ipa_msg(S, StreamMap, CcmOptions, Trailer). send_close_signal([]) -> ok; @@ -237,22 +248,30 @@ StreamMap = ets:new(stream_map, [set]), ets:insert(ipa_sockets, #ipa_socket{socket=Socket, ipaPid=self(), streamTbl=StreamMap}), CallingPid ! {ipa_init_sock_done, Socket}, - loop(Socket, StreamMap). + loop(Socket, StreamMap, #ipa_ccm_options{}). -loop(S, StreamMap) -> +loop(S, StreamMap, CcmOptions) -> receive {request, From, Request} -> - Reply = ipa_proto:request(Request), + Result = ipa_proto:request(Request), + case Result of + {ccm_options, NewCcmOptions} -> + NextCcmOptions = NewCcmOptions, + Reply = ok; + EmbeddedReply -> + NextCcmOptions = CcmOptions, + Reply = EmbeddedReply + end, ipa_proto:reply(From, Reply), - ipa_proto:loop(S, StreamMap); + ipa_proto:loop(S, StreamMap, NextCcmOptions); {ipa_send, S, StreamId, Data} -> send(S, StreamId, Data), - ipa_proto:loop(S, StreamMap); + ipa_proto:loop(S, StreamMap, CcmOptions); {tcp, S, Data} -> % process incoming IPA message and mark socket active once more - ipa_proto:process_rx_ipa_msg(S, StreamMap, Data), + ipa_proto:process_rx_ipa_msg(S, StreamMap, CcmOptions, Data), inet:setopts(S, [{active, once}]), - ipa_proto:loop(S, StreamMap); + ipa_proto:loop(S, StreamMap, CcmOptions); {tcp_closed, S} -> io:format("Socket ~w closed [~w]~n", [S,self()]), ipa_proto:process_tcp_closed(S, StreamMap), @@ -261,26 +280,42 @@ end. % Respond with PONG to PING -process_ccm_msg(Socket, StreamID, ping, _) -> +process_ccm_msg(Socket, StreamID, _, ping, _) -> io:format("Socket ~p Stream ~p: PING -> PONG~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_ACK with ID_ACK -process_ccm_msg(Socket, StreamID, id_ack, _) -> +process_ccm_msg(Socket, StreamID, _, id_ack, _) -> io:format("Socket ~p Stream ~p: ID_ACK -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_RESP with ID_ACK -process_ccm_msg(Socket, StreamID, id_resp, _) -> +process_ccm_msg(Socket, StreamID, _, id_resp, _) -> io:format("Socket ~p Stream ~p: ID_RESP -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); +% Simply respond to ID_GET with ID_RESP +process_ccm_msg(Socket, StreamID, CcmOptions, id_req, _) -> + io:format("Socket ~p Stream ~p: ID_GET -> ID_RESP~n", [Socket, StreamID]), + CcmBin = ipa_proto_ccm:encode( + {id_resp, + [{string,serial_nr,CcmOptions#ipa_ccm_options.serial_number}, + {string,unit_id,CcmOptions#ipa_ccm_options.unit_id}, + {string,mac_address,CcmOptions#ipa_ccm_options.mac_address}, + {string,location,CcmOptions#ipa_ccm_options.location}, + {string,unit_type,CcmOptions#ipa_ccm_options.unit_type}, + {string,equip_vers,CcmOptions#ipa_ccm_options.equipment_version}, + {string,sw_version,CcmOptions#ipa_ccm_options.sw_version}, + {string,unit_name,CcmOptions#ipa_ccm_options.unit_name} + ]}), + send(Socket, StreamID, CcmBin); + % Default message handler for unknown messages -process_ccm_msg(Socket, StreamID, MsgType, Opts) -> +process_ccm_msg(Socket, StreamID, _, MsgType, Opts) -> io:format("Socket ~p Stream ~p: Unknown CCM message type ~p Opts ~p~n", [Socket, StreamID, MsgType, Opts]). % process an incoming CCM message (Stream ID 254) -process_rx_ccm_msg(Socket, StreamID, PayloadBin) -> +process_rx_ccm_msg(Socket, StreamID, CcmOptions, PayloadBin) -> {MsgType, Opts} = ipa_proto_ccm:decode(PayloadBin), - process_ccm_msg(Socket, StreamID, MsgType, Opts). + process_ccm_msg(Socket, StreamID, CcmOptions, MsgType, Opts). send_ccm_id_get(Socket) -> send(Socket, ?IPAC_PROTO_CCM, <>). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:05:20 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Tue, 8 Sep 2020 09:05:20 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Allow configuring ack initiation behavior References: Message-ID: matt9j has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 ) Change subject: ipa_proto: Allow configuring ack initiation behavior ...................................................................... ipa_proto: Allow configuring ack initiation behavior When the osmo-msc version 1.6.1 connects to the osmo-hlr, it sends an id response and an immediate ack. This does not match the handshake spec as I understand it or was implemented here. This commit allows initiating a nonstandard ack if needed to mimic behavior of particular components. Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e --- M include/ipa.hrl M src/ipa_proto.erl 2 files changed, 19 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/19/20019/1 diff --git a/include/ipa.hrl b/include/ipa.hrl index 352057f..865dcc8 100644 --- a/include/ipa.hrl +++ b/include/ipa.hrl @@ -26,7 +26,7 @@ unit_type, equipment_version, sw_version, - unit_name - }). + unit_name, + initiate_nonstandard_ack=false}). -endif. diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index 18b74bd..7189033 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -283,10 +283,15 @@ process_ccm_msg(Socket, StreamID, _, ping, _) -> io:format("Socket ~p Stream ~p: PING -> PONG~n", [Socket, StreamID]), send(Socket, StreamID, <>); -% Simply respond to ID_ACK with ID_ACK -process_ccm_msg(Socket, StreamID, _, id_ack, _) -> +% Respond to ID_ACK with ID_ACK if this instance did not initiate +process_ccm_msg(Socket, StreamID, CcmOptions, id_ack, _) -> io:format("Socket ~p Stream ~p: ID_ACK -> ID_ACK~n", [Socket, StreamID]), - send(Socket, StreamID, <>); + if + CcmOptions#ipa_ccm_options.initiate_nonstandard_ack /= true -> + % Only respond to an ack if this instance did + % not initiate to prevent an infinite ack loop. + send(Socket, StreamID, <>) + end; % Simply respond to ID_RESP with ID_ACK process_ccm_msg(Socket, StreamID, _, id_resp, _) -> io:format("Socket ~p Stream ~p: ID_RESP -> ID_ACK~n", [Socket, StreamID]), @@ -305,7 +310,15 @@ {string,sw_version,CcmOptions#ipa_ccm_options.sw_version}, {string,unit_name,CcmOptions#ipa_ccm_options.unit_name} ]}), - send(Socket, StreamID, CcmBin); + send(Socket, StreamID, CcmBin), + + if + CcmOptions#ipa_ccm_options.initiate_nonstandard_ack -> + % Send the ack from the same entity which + % generates the response if configured to + % match behavior of other components. + send(Socket, StreamID, <>) + end; % Default message handler for unknown messages process_ccm_msg(Socket, StreamID, _, MsgType, Opts) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e Gerrit-Change-Number: 20019 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:44:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 09:44:45 +0000 Subject: Change in osmo-pcu[master]: encoding: use CSN.1 codec to generate Packet Uplink Assignment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19787 ) Change subject: encoding: use CSN.1 codec to generate Packet Uplink Assignment ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Gerrit-Change-Number: 19787 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 09:44:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:45:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 09:45:29 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19788 ) Change subject: encoding: implement handing of hopping parameters ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 09:45:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:47:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 09:47:59 +0000 Subject: Change in osmo-bts[master]: scheduler: Drop unused function trx_sched_reset() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20011 ) Change subject: scheduler: Drop unused function trx_sched_reset() ...................................................................... scheduler: Drop unused function trx_sched_reset() Change-Id: Id31e82b6bbfdd8030612c78737c0aa7dd7e20bd0 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c 2 files changed, 0 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 47c0e9a..0d86347 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -192,10 +192,6 @@ int trx_sched_set_cipher(struct l1sched_trx *l1t, uint8_t chan_nr, int downlink, int algo, uint8_t *key, int key_len); -/* \brief close all logical channels and reset timeslots */ -void trx_sched_reset(struct l1sched_trx *l1t); - - /* frame structures */ struct trx_sched_frame { /*! \brief downlink TRX channel type */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index c5b3830..e7cbc83 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -639,13 +639,6 @@ } } -/* close all logical channels and reset timeslots */ -void trx_sched_reset(struct l1sched_trx *l1t) -{ - trx_sched_exit(l1t); - trx_sched_init(l1t, l1t->trx); -} - struct msgb *_sched_dequeue_prim(struct l1sched_trx *l1t, int8_t tn, uint32_t fn, enum trx_chan_type chan) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id31e82b6bbfdd8030612c78737c0aa7dd7e20bd0 Gerrit-Change-Number: 20011 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:50:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 09:50:54 +0000 Subject: Change in osmo-pcu[master]: encoding: clarify docstring for write_packet_downlink_assignment() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20014 ) Change subject: encoding: clarify docstring for write_packet_downlink_assignment() ...................................................................... encoding: clarify docstring for write_packet_downlink_assignment() Change-Id: I7c4458c2e7767b6cf03462ba79acdd9c9904ee83 --- M src/encoding.cpp 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 76a1cec..2cee251 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -628,15 +628,14 @@ } -/* generate downlink assignment */ +/* Generate Packet Downlink Assignment as per 3GPP TS 44.060, section 11.2.7. + * NOTE: 'block' is expected to be zero-initialized by the caller. */ void Encoding::write_packet_downlink_assignment(RlcMacDownlink_t * block, bool old_tfi_is_valid, uint8_t old_tfi, uint8_t old_downlink, const struct gprs_rlcmac_dl_tbf *tbf, uint8_t poll, uint8_t rrbp, uint8_t alpha, uint8_t gamma, int8_t ta_idx, uint8_t ta_ts, bool use_egprs) { - // Packet downlink assignment TS 44.060 11.2.7 - PDA_AdditionsR99_t *pda_r99; uint8_t tn; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c4458c2e7767b6cf03462ba79acdd9c9904ee83 Gerrit-Change-Number: 20014 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:50:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 09:50:54 +0000 Subject: Change in osmo-pcu[master]: encoding: use CSN.1 codec to generate Packet Uplink Assignment In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19787 ) Change subject: encoding: use CSN.1 codec to generate Packet Uplink Assignment ...................................................................... encoding: use CSN.1 codec to generate Packet Uplink Assignment It's quite odd to see that in write_packet_downlink_assignment() we initialize an 'RlcMacDownlink_t', so then the caller can use the power of CSN.1 codec to generate the final sequence of bytes to be transmitted, while in write_packet_uplink_assignment() we already compose the final RLC/MAC message straight away using the low-level bitvec API (like bitvec_write_field()). I guess the reason is that at the time of writing this code, the CSN.1 codec was not stable enough, so it was safer to generate the message 'by hand'. This would also explain why we *decode* the final RLC/MAC message in create_ul_ass() right after encoding. Rewrite write_packet_uplink_assignment(), so now it initializes a caller-provided 'RlcMacDownlink_t' structure. Given that it's allocated on heap using talloc_zero(), do not initialize presence indicators of fields that are not present in the message. This would facilitate handling of frequency hopping parameters in the upcoming changes, in particular we can now introduce a function that would compose Frequency Parameters IE for both write_packet_{downlink,uplink}_assignment(). Tested manually by running a GPRS-enabled network, as well as by running test cases from ttcn3-pcu-test => no regressions observed. Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Related: SYS#4868, OS#4547 --- M src/encoding.cpp M src/encoding.h M src/tbf.cpp 3 files changed, 108 insertions(+), 78 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 2cee251..ef21b61 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -536,95 +536,125 @@ return plen; } -/* generate uplink assignment */ +/* Generate Packet Uplink Assignment as per 3GPP TS 44.060, section 11.2.29. + * NOTE: 'block' is expected to be zero-initialized by the caller. */ void Encoding::write_packet_uplink_assignment( - bitvec * dest, uint8_t old_tfi, + RlcMacDownlink_t * block, uint8_t old_tfi, uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli, const struct gprs_rlcmac_ul_tbf *tbf, uint8_t poll, uint8_t rrbp, uint8_t alpha, uint8_t gamma, int8_t ta_idx, bool use_egprs) { - // TODO We should use our implementation of encode RLC/MAC Control messages. - unsigned wp = 0; - uint8_t ts; - /* timeslot assigned for the Continuous Timing Advance procedure */ - uint8_t ta_ts = 0; /* FIXME: supply it as parameter from caller */ + Packet_Uplink_Assignment_t *pua; + Packet_Timing_Advance_t *pta; + Frequency_Parameters_t *fp; + Dynamic_Allocation_t *da; - bitvec_write_field(dest, &wp,0x1,2); // Payload Type - bitvec_write_field(dest, &wp,rrbp,2); // Uplink block with TDMA framenumber (N+13) - bitvec_write_field(dest, &wp,poll,1); // Suppl/Polling Bit - bitvec_write_field(dest, &wp,0x0,3); // Uplink state flag - bitvec_write_field(dest, &wp,0xa,6); // MESSAGE TYPE + /* RLC/MAC control block without the optional RLC/MAC control header */ + block->PAYLOAD_TYPE = 0x01; // Payload Type + block->RRBP = rrbp; // RRBP (e.g. N+13) + block->SP = poll; // RRBP field is valid + block->USF = 0x00; // Uplink state flag - bitvec_write_field(dest, &wp,0x0,2); // Page Mode + /* See 3GPP TS 44.060, section 11.2.29 */ + pua = &block->u.Packet_Uplink_Assignment; + pua->MESSAGE_TYPE = 0x0a; // Packet Uplink Assignment + pua->PAGE_MODE = 0x00; // Normal Paging - bitvec_write_field(dest, &wp,0x0,1); // switch PERSIST_LEVEL: off + /* TLLI or Global (UL/DL) TFI */ if (use_tlli) { - bitvec_write_field(dest, &wp,0x2,2); // switch TLLI : on - bitvec_write_field(dest, &wp,tlli,32); // TLLI + pua->ID.UnionType = 0x01; + pua->ID.u.TLLI = tlli; } else { - bitvec_write_field(dest, &wp,0x0,1); // switch TFI : on - bitvec_write_field(dest, &wp,old_downlink,1); // 0=UPLINK TFI, 1=DL TFI - bitvec_write_field(dest, &wp,old_tfi,5); // TFI + pua->ID.UnionType = 0x00; + pua->ID.u.Global_TFI.UnionType = old_downlink; + pua->ID.u.Global_TFI.u.UPLINK_TFI = old_tfi; } + /* GPRS/EGPRS specific parameters */ + pua->UnionType = use_egprs ? 0x01 : 0x00; if (!use_egprs) { - bitvec_write_field(dest, &wp,0x0,1); // Message escape - bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 2); // CHANNEL_CODING_COMMAND - bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING - write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); - } else { /* EPGRS */ - bitvec_write_field(dest, &wp,0x1,1); // Message escape - bitvec_write_field(dest, &wp,0x0,2); // EGPRS message contents - bitvec_write_field(dest, &wp,0x0,1); // No CONTENTION_RESOLUTION_TLLI - bitvec_write_field(dest, &wp,0x0,1); // No COMPACT reduced MA - bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 4); // EGPRS Modulation and Coding IE - /* 0: no RESEGMENT, 1: Segmentation*/ - bitvec_write_field(dest, &wp, 0x1, 1); - write_ws(dest, &wp, tbf->window_size()); // EGPRS Window Size - bitvec_write_field(dest, &wp,0x0,1); // No Access Technologies Request - bitvec_write_field(dest, &wp,0x0,1); // No ARAC RETRANSMISSION REQUEST - bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING - bitvec_write_field(dest, &wp,0x0,1); // No BEP_PERIOD2 - write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); - bitvec_write_field(dest, &wp,0x0,1); // No Packet Extended Timing Advance + PUA_GPRS_t *gprs = &pua->u.PUA_GPRS_Struct; + + /* Use the commanded CS/MSC value during the content resolution */ + gprs->CHANNEL_CODING_COMMAND = mcs_chan_code(tbf->current_cs()); + gprs->TLLI_BLOCK_CHANNEL_CODING = 0x01; // ^^^ + + /* Dynamic allocation */ + gprs->UnionType = 0x01; + /* Frequency Parameters IE is present */ + gprs->Exist_Frequency_Parameters = 0x01; + + /* Common parameters to be set below */ + pta = &gprs->Packet_Timing_Advance; + fp = &gprs->Frequency_Parameters; + da = &gprs->u.Dynamic_Allocation; + } else { + PUA_EGPRS_00_t *egprs = &pua->u.PUA_EGPRS_Struct.u.PUA_EGPRS_00; + pua->u.PUA_EGPRS_Struct.UnionType = 0x00; // 'Normal' EGPRS, not EGPRS2 + + /* Use the commanded CS/MSC value during the content resolution */ + egprs->EGPRS_CHANNEL_CODING_COMMAND = mcs_chan_code(tbf->current_cs()); + egprs->TLLI_BLOCK_CHANNEL_CODING = 0x01; // ^^^ + egprs->RESEGMENT = 0x01; // Enable segmentation + egprs->EGPRS_WindowSize = tbf->window_size(); + + /* Dynamic allocation */ + egprs->UnionType = 0x01; + /* Frequency Parameters IE is present */ + egprs->Exist_Frequency_Parameters = 0x01; + + /* Common parameters to be set below */ + pta = &egprs->Packet_Timing_Advance; + fp = &egprs->Frequency_Parameters; + da = &egprs->u.Dynamic_Allocation; } -#if 1 - bitvec_write_field(dest, &wp,0x1,1); // Frequency Parameters information elements = present - bitvec_write_field(dest, &wp,tbf->tsc(),3); // Training Sequence Code (TSC) - bitvec_write_field(dest, &wp,0x0,2); // ARFCN = present - bitvec_write_field(dest, &wp,tbf->trx->arfcn,10); // ARFCN -#else - bitvec_write_field(dest, &wp,0x0,1); // Frequency Parameters = off -#endif - - bitvec_write_field(dest, &wp,0x1,2); // Dynamic Allocation - - bitvec_write_field(dest, &wp,0x0,1); // Extended Dynamic Allocation = off - bitvec_write_field(dest, &wp,0x0,1); // P0 = off - - bitvec_write_field(dest, &wp,0x0,1); // USF_GRANULARITY - bitvec_write_field(dest, &wp,0x1,1); // switch TFI : on - bitvec_write_field(dest, &wp,tbf->tfi(),5);// TFI - - bitvec_write_field(dest, &wp,0x0,1); // - bitvec_write_field(dest, &wp,0x0,1); // TBF Starting Time = off - if (alpha || gamma) { - bitvec_write_field(dest, &wp,0x1,1); // Timeslot Allocation with Power Control - bitvec_write_field(dest, &wp,alpha,4); // ALPHA - } else - bitvec_write_field(dest, &wp,0x0,1); // Timeslot Allocation - - for (ts = 0; ts < 8; ts++) { - if (tbf->pdch[ts]) { - bitvec_write_field(dest, &wp,0x1,1); // USF_TN(i): on - bitvec_write_field(dest, &wp,tbf->m_usf[ts],3); // USF_TN(i) - if (alpha || gamma) - bitvec_write_field(dest, &wp,gamma,5); // GAMMA power control parameter - } else - bitvec_write_field(dest, &wp,0x0,1); // USF_TN(i): off + /* Packet Timing Advance (if known) */ + if (tbf->ta() <= 63) { /* { 0 | 1 < TIMING_ADVANCE_VALUE : bit (6) > } */ + pta->Exist_TIMING_ADVANCE_VALUE = 0x01; // Present + pta->TIMING_ADVANCE_VALUE = tbf->ta(); } - // bitvec_write_field(dest, &wp,0x0,1); // Measurement Mapping struct not present + + /* Continuous Timing Advance Control */ + if (ta_idx >= 0 && ta_idx < 16) { + pta->Exist_IndexAndtimeSlot = 0x01; // Present + pta->TIMING_ADVANCE_TIMESLOT_NUMBER = 0; // FIXME! + pta->TIMING_ADVANCE_INDEX = ta_idx; + } + + /* Frequency Parameters IE */ + fp->TSC = tbf->tsc(); // Training Sequence Code (TSC) + fp->UnionType = 0x00; // Single ARFCN + fp->u.ARFCN = tbf->trx->arfcn; + + /* Dynamic allocation parameters */ + da->USF_GRANULARITY = 0x00; + + /* Assign an Uplink TFI */ + da->Exist_UPLINK_TFI_ASSIGNMENT = 0x01; + da->UPLINK_TFI_ASSIGNMENT = tbf->tfi(); + + /* Timeslot Allocation with or without Power Control */ + da->UnionType = (alpha || gamma) ? 0x01 : 0x00; + if (da->UnionType == 0x01) + da->u.Timeslot_Allocation_Power_Ctrl_Param.ALPHA = alpha; + + for (unsigned int tn = 0; tn < 8; tn++) { + if (tbf->pdch[tn] == NULL) + continue; + + if (da->UnionType == 0x01) { + Timeslot_Allocation_Power_Ctrl_Param_t *params = \ + &da->u.Timeslot_Allocation_Power_Ctrl_Param; + params->Slot[tn].Exist = 0x01; // Enable this timeslot + params->Slot[tn].USF_TN = tbf->m_usf[tn]; // USF_TN(i) + params->Slot[tn].GAMMA_TN = gamma; + } else { + Timeslot_Allocation_t *slot = &da->u.Timeslot_Allocation[tn]; + slot->Exist = 0x01; // Enable this timeslot + slot->USF_TN = tbf->m_usf[tn]; // USF_TN(i) + } + } } diff --git a/src/encoding.h b/src/encoding.h index 18392f7..5f8496e 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -58,7 +58,7 @@ ); static void write_packet_uplink_assignment( - bitvec * dest, uint8_t old_tfi, + RlcMacDownlink_t * block, uint8_t old_tfi, uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli, const struct gprs_rlcmac_ul_tbf *tbf, uint8_t poll, uint8_t rrbp, uint8_t alpha, uint8_t gamma, int8_t ta_idx, diff --git a/src/tbf.cpp b/src/tbf.cpp index c1ec729..0447edc 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -1368,16 +1368,16 @@ bitvec_unhex(&bv, DUMMY_VEC); LOGPTBF(new_tbf, LOGL_INFO, "start Packet Uplink Assignment (PACCH)\n"); - Encoding::write_packet_uplink_assignment(&bv, m_tfi, + mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t); + Encoding::write_packet_uplink_assignment(mac_control_block, m_tfi, (direction == GPRS_RLCMAC_DL_TBF), tlli(), is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha, bts_data()->gamma, -1, is_egprs_enabled()); - mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t); LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n"); - rc = decode_gsm_rlcmac_downlink(&bv, mac_control_block); + rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block); if (rc < 0) { - LOGP(DTBF, LOGL_ERROR, "Decoding of Packet Uplink Ass failed (%d)\n", rc); + LOGP(DTBF, LOGL_ERROR, "Encoding of Packet Uplink Ass failed (%d)\n", rc); goto free_ret; } LOGP(DTBF, LOGL_DEBUG, "------------------------- TX : Packet Uplink Assignment -------------------------\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2850b91e0043cdca8ae7498a5fc727eeedd029b6 Gerrit-Change-Number: 19787 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 09:50:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 09:50:55 +0000 Subject: Change in osmo-pcu[master]: encoding: implement handing of hopping parameters In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19788 ) Change subject: encoding: implement handing of hopping parameters ...................................................................... encoding: implement handing of hopping parameters The following test cases verify coding of the hopping parameters: + (RR) Immediate Assignment - TC_pcuif_fh_imm_ass_ul_egprs, - TC_pcuif_fh_imm_ass_ul, - TC_pcuif_fh_imm_ass_dl, + (RLC/MAC) Packet Uplink/Downlink Assignment: - TC_pcuif_fh_pkt_ass_ul, - TC_pcuif_fh_pkt_ass_dl, all of them pass with this (and the upcoming) change applied. Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Related: SYS#4868, OS#4547 --- M src/encoding.cpp M src/pdch.h 2 files changed, 71 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index ef21b61..ecf40de 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -467,8 +467,15 @@ bitvec_write_field(dest, &wp, pdch->ts_no, 3); // TN bitvec_write_field(dest, &wp, pdch->tsc, 3); // TSC - bitvec_write_field(dest, &wp, 0x00, 3); // spare (non-hopping RF channel configuraion) - bitvec_write_field(dest, &wp, pdch->trx->arfcn, 10); // ARFCN + /* RF channel configuraion: hopping or non-hopping */ + if (pdch->fh.enabled) { + bitvec_write_field(dest, &wp, 0x01, 1); /* direct encoding */ + bitvec_write_field(dest, &wp, pdch->fh.maio, 6); + bitvec_write_field(dest, &wp, pdch->fh.hsn, 6); + } else { + bitvec_write_field(dest, &wp, 0x00, 3); + bitvec_write_field(dest, &wp, pdch->trx->arfcn, 10); + } //10.5.2.30 Request Reference if (((burst_type == GSM_L1_BURST_TYPE_ACCESS_1) || @@ -486,9 +493,16 @@ bitvec_write_field(dest, &wp,0x0,2); // spare bitvec_write_field(dest, &wp,ta,6); // Timing Advance value - // No mobile allocation in non-hopping systems. - // A zero-length LV. Just write L=0. - bitvec_write_field(dest, &wp,0,8); + /* 10.5.2.21 Mobile Allocation */ + if (pdch->fh.enabled) { + bitvec_write_field(dest, &wp, pdch->fh.ma_oct_len, 8); + for (int i = 0; i < pdch->fh.ma_oct_len; i++) + bitvec_write_field(dest, &wp, pdch->fh.ma[i], 8); + } else { + // No mobile allocation in non-hopping systems. + // A zero-length LV. Just write L=0. + bitvec_write_field(dest, &wp, 0x00, 8); + } OSMO_ASSERT(wp % 8 == 0); @@ -536,6 +550,44 @@ return plen; } +/* Prepare to be encoded Frequency Parameters IE (see Table 12.8.1) */ +static void gen_freq_params(Frequency_Parameters_t *freq_params, + const struct gprs_rlcmac_tbf *tbf) +{ + const struct gprs_rlcmac_pdch *pdch; + Direct_encoding_1_t fh_params; + + /* Check one PDCH, if it's hopping then all other should too */ + pdch = tbf->pdch[tbf->first_ts]; + OSMO_ASSERT(pdch != NULL); + + /* Training Sequence Code */ + freq_params->TSC = pdch->tsc; + + /* If frequency hopping is not in use, encode a single ARFCN */ + if (pdch == NULL || !pdch->fh.enabled) { + freq_params->UnionType = 0x00; + freq_params->u.ARFCN = tbf->trx->arfcn; + return; + } + + /* Direct encoding 1 (see Table 12.8.1) */ + freq_params->UnionType = 0x2; + + /* HSN / MAIO */ + fh_params.MAIO = pdch->fh.maio; + fh_params.GPRS_Mobile_Allocation.HSN = pdch->fh.hsn; + fh_params.GPRS_Mobile_Allocation.ElementsOf_RFL_NUMBER = 0; + + /* Mobile Allocation bitmap */ + fh_params.GPRS_Mobile_Allocation.UnionType = 0; /* MA bitmap */ + fh_params.GPRS_Mobile_Allocation.u.MA.MA_LENGTH = pdch->fh.ma_oct_len; /* in bytes */ + fh_params.GPRS_Mobile_Allocation.u.MA.MA_BitLength = pdch->fh.ma_bit_len; /* in bits */ + memcpy(fh_params.GPRS_Mobile_Allocation.u.MA.MA_BITMAP, pdch->fh.ma, pdch->fh.ma_oct_len); + + freq_params->u.Direct_encoding_1 = fh_params; +} + /* Generate Packet Uplink Assignment as per 3GPP TS 44.060, section 11.2.29. * NOTE: 'block' is expected to be zero-initialized by the caller. */ void Encoding::write_packet_uplink_assignment( @@ -623,9 +675,7 @@ } /* Frequency Parameters IE */ - fp->TSC = tbf->tsc(); // Training Sequence Code (TSC) - fp->UnionType = 0x00; // Single ARFCN - fp->u.ARFCN = tbf->trx->arfcn; + gen_freq_params(fp, tbf); /* Dynamic allocation parameters */ da->USF_GRANULARITY = 0x00; @@ -716,9 +766,7 @@ block->u.Packet_Downlink_Assignment.Exist_P0_and_BTS_PWR_CTRL_MODE = 0x0; // POWER CONTROL = off block->u.Packet_Downlink_Assignment.Exist_Frequency_Parameters = 0x1; // Frequency Parameters = on - block->u.Packet_Downlink_Assignment.Frequency_Parameters.TSC = tbf->tsc(); // Training Sequence Code (TSC) - block->u.Packet_Downlink_Assignment.Frequency_Parameters.UnionType = 0x0; // ARFCN = on - block->u.Packet_Downlink_Assignment.Frequency_Parameters.u.ARFCN = tbf->trx->arfcn; // ARFCN + gen_freq_params(&block->u.Packet_Downlink_Assignment.Frequency_Parameters, tbf); block->u.Packet_Downlink_Assignment.Exist_DOWNLINK_TFI_ASSIGNMENT = 0x1; // DOWNLINK TFI ASSIGNMENT = on block->u.Packet_Downlink_Assignment.DOWNLINK_TFI_ASSIGNMENT = tbf->tfi(); // TFI diff --git a/src/pdch.h b/src/pdch.h index e1e3688..1c0993f 100644 --- a/src/pdch.h +++ b/src/pdch.h @@ -106,6 +106,18 @@ void update_ta(uint8_t tai, uint8_t ta); #endif + /* Frequency hopping parameters */ + struct { + bool enabled; + /* 3GPP TS 45.002 HSN / MAIO (6 bit each) */ + uint8_t hsn; + uint8_t maio; + /* 3GPP TS 44.018, 10.5.2.21 "Mobile Allocation" */ + uint8_t ma_oct_len; + uint8_t ma_bit_len; + uint8_t ma[8]; + } fh; + /* back pointers */ struct gprs_rlcmac_trx *trx; uint8_t ts_no; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Gerrit-Change-Number: 19788 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 11:01:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 11:01:57 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Avoid sending packets on recvonly connection References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20029 ) Change subject: mgw: osmux: Avoid sending packets on recvonly connection ...................................................................... mgw: osmux: Avoid sending packets on recvonly connection Change-Id: I87b1fb7d73cbbb2a5d4d8a40a9527a3e05d9947b --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 17 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/29/20029/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 5864c95..02e31bb 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -35,6 +35,7 @@ struct osmux_handle { struct llist_head head; + struct mgcp_conn_rtp *conn; struct osmux_in_handle *in; struct in_addr rem_addr; int rem_port; /* network byte order */ @@ -47,14 +48,17 @@ static void osmux_deliver_cb(struct msgb *batch_msg, void *data) { struct osmux_handle *handle = data; - struct sockaddr_in out = { - .sin_family = AF_INET, - .sin_port = handle->rem_port, - }; + struct mgcp_conn_rtp *conn = handle->conn; - memcpy(&out.sin_addr, &handle->rem_addr, sizeof(handle->rem_addr)); - sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, - (struct sockaddr *)&out, sizeof(out)); + if (conn->end.output_enabled) { + struct sockaddr_in out = { + .sin_family = AF_INET, + .sin_port = handle->rem_port, + }; + memcpy(&out.sin_addr, &handle->rem_addr, sizeof(handle->rem_addr)); + sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, + (struct sockaddr *)&out, sizeof(out)); + } msgb_free(batch_msg); } @@ -109,13 +113,15 @@ /* Allocate free OSMUX handle */ static struct osmux_handle * -osmux_handle_alloc(struct mgcp_config *cfg, struct in_addr *addr, int rem_port) +osmux_handle_alloc(struct mgcp_conn_rtp *conn, struct in_addr *addr, int rem_port) { struct osmux_handle *h; + struct mgcp_config *cfg = conn->conn->endp->cfg; h = talloc_zero(osmux, struct osmux_handle); if (!h) return NULL; + h->conn = conn; h->rem_addr = *addr; h->rem_port = rem_port; h->refcnt++; @@ -148,7 +154,7 @@ /* Lookup existing handle for a specified address, if the handle can not be * found, the function will automatically allocate one */ static struct osmux_in_handle * -osmux_handle_lookup(struct mgcp_config *cfg, struct osmo_sockaddr *addr, int rem_port) +osmux_handle_lookup(struct mgcp_conn_rtp *conn, struct osmo_sockaddr *addr, int rem_port) { struct osmux_handle *h; @@ -161,7 +167,7 @@ if (h != NULL) return h->in; - h = osmux_handle_alloc(cfg, &addr->u.sin.sin_addr, rem_port); + h = osmux_handle_alloc(conn, &addr->u.sin.sin_addr, rem_port); if (h == NULL) return NULL; @@ -474,7 +480,7 @@ return -1; } - conn->osmux.in = osmux_handle_lookup(endp->cfg, addr, port); + conn->osmux.in = osmux_handle_lookup(conn, addr, port); if (!conn->osmux.in) { LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, "Cannot allocate input osmux handle for conn:%s\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87b1fb7d73cbbb2a5d4d8a40a9527a3e05d9947b Gerrit-Change-Number: 20029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 14:46:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 14:46:39 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 ) Change subject: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib1be00f73146519c8cc78bb08dd26a110771cd55 Gerrit-Change-Number: 20017 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 14:46:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 14:48:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 14:48:04 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 ) Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 14:48:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 14:49:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 14:49:05 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Allow configuring ack initiation behavior In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 ) Change subject: ipa_proto: Allow configuring ack initiation behavior ...................................................................... Patch Set 1: Code-Review+1 adding neels here as he might know why osmo-msc behaves strangely. In either case, I'm happy to merge a work-around here. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e Gerrit-Change-Number: 20019 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 08 Sep 2020 14:49:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 14:49:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 14:49:34 +0000 Subject: Change in ...osmo_dia2gsup[master]: app.src: Add dependencies required for a clean build In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/20020 ) Change subject: app.src: Add dependencies required for a clean build ...................................................................... Patch Set 1: Code-Review+1 This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/20020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I4a6b963daf64695acd626a434bc4718fb5be40d6 Gerrit-Change-Number: 20020 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 14:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 14:53:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 8 Sep 2020 14:53:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 ) Change subject: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE ...................................................................... Patch Set 1: Code-Review-2 I'm pretty sure that the current ordering matches, because we have to remove the 'FIELDORDER("msg")'. I also had a patch changing the spare and discriminator order, and hacked a 1 into the discriminator to verify. So the way to go is to remove the "msb", not change the order. I hope I didn't get something completely wrong, since you also said you successfully decoded a message with this code? That part still confuses me a little bit. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie9bbf99df0b189846c8ea3159bfd3c9a0ee5df2a Gerrit-Change-Number: 20015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 08 Sep 2020 14:53:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 14:54:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 14:54:53 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19969 ) Change subject: mgw: Initial IPv6 support ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 14:54:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 15:02:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 15:02:03 +0000 Subject: Change in osmo-mgw[master]: mgw: Release endpoint after last conn times out References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20030 ) Change subject: mgw: Release endpoint after last conn times out ...................................................................... mgw: Release endpoint after last conn times out Otherwise some state is kept, like the previous CallId, which may then provoke issues next time the endpoint is to be used. Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_network.c 4 files changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/20030/1 diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 14cae25..8d19b44 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -139,3 +139,5 @@ struct mgcp_endpoint *mgcp_endp_by_name(int *cause, const char *epname, struct mgcp_config *cfg); bool mgcp_endp_avail(struct mgcp_endpoint *endp); +void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn); +void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 328e580..6424dcb 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -199,7 +199,7 @@ /* Initialize watchdog */ osmo_timer_setup(&conn->watchdog, mgcp_conn_watchdog_cb, conn); mgcp_conn_watchdog_kick(conn); - llist_add(&conn->entry, &endp->conns); + mgcp_endp_add_conn(endp, conn); return conn; } @@ -289,12 +289,6 @@ if (!conn) return; - /* Run endpoint cleanup action. By this we inform the endpoint about - * the removal of the connection and allow it to clean up its inner - * state accordingly */ - if (endp->type->cleanup_cb) - endp->type->cleanup_cb(endp, conn); - switch (conn->type) { case MGCP_CONN_TYPE_RTP: aggregate_rtp_conn_stats(endp, &conn->u.rtp); @@ -308,7 +302,8 @@ } osmo_timer_del(&conn->watchdog); - llist_del(&conn->entry); + mgcp_endp_remove_conn(endp, conn); + /* WARN: endp may have be freed after call to mgcp_endp_remove_conn */ talloc_free(conn); } diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index c4f3653..ecb2845 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -666,3 +666,20 @@ OSMO_ASSERT(false); } } + +void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn) +{ + llist_add(&conn->entry, &endp->conns); +} + +void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn) +{ + /* Run endpoint cleanup action. By this we inform the endpoint about + * the removal of the connection and allow it to clean up its inner + * state accordingly */ + if (endp->type->cleanup_cb) + endp->type->cleanup_cb(endp, conn); + llist_del(&conn->entry); + if (llist_empty(&endp->conns)) + mgcp_endp_release(endp); +} diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 75a4754..fa40f1f 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1379,7 +1379,8 @@ * connections present when one connection is removed from the * endpoint. */ llist_for_each_entry(conn_cleanup, &endp->conns, entry) { - conn_cleanup->priv = NULL; + if (conn_cleanup->priv == conn) + conn_cleanup->priv = NULL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f Gerrit-Change-Number: 20030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 15:24:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 15:24:40 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19969 ) Change subject: mgw: Initial IPv6 support ...................................................................... Patch Set 2: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 15:24:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 15:34:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 15:34:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 ) Change subject: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-2 > > I'm pretty sure that the current ordering matches, because we have to remove the 'FIELDORDER("msg")'. I also had a patch changing the spare and discriminator order, and hacked a 1 into the discriminator to verify. So the way to go is to remove the "msb", not change the order. In BSSAP_LE_Types.ttcn we defile MSB globally, but in PDU_BSSAP_LE we use LSB order (from right to left), so it's wrong. Either we remove the global MSB attribute (I would rather explicitly change it to LSB and keep in the bottom), or follow the MSB order and place them from left to right. > I hope I didn't get something completely wrong, since you also said you successfully decoded a message with this code? That part still confuses me a little bit. Given that that in your sample ('000E2B44010005080062F2240017002A'O) contains '00'O at that position, it does not matter which way you place those fields. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie9bbf99df0b189846c8ea3159bfd3c9a0ee5df2a Gerrit-Change-Number: 20015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 08 Sep 2020 15:34:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 15:41:19 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 15:41:19 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow setting IPv6 addresses In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19916 ) Change subject: mgcp_client: Allow setting IPv6 addresses ...................................................................... Patch Set 3: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f Gerrit-Change-Number: 19916 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 15:41:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 15:51:39 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 15:51:39 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow submitting and parsing IPv6 addr in SDP In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19888 ) Change subject: mgcp_client: Allow submitting and parsing IPv6 addr in SDP ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I936bf57d37f5f0607dfe7fc66c37e424c3793f9b Gerrit-Change-Number: 19888 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 15:51:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 15:54:08 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 15:54:08 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19920 ) Change subject: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1be6f3b71486ce1782ba6b8c62f25145b42ec894 Gerrit-Change-Number: 19920 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 15:54:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:06:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:06:12 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Fix conn watchdog timeout not updated References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20031 ) Change subject: mgw: osmux: Fix conn watchdog timeout not updated ...................................................................... mgw: osmux: Fix conn watchdog timeout not updated It is currently done upon receival of RTP packets in rx_rtp for pure RTP conns, but nothing similar is done for Osmux conns, which eventually trigger a connection time out. Change-Id: Id592d7db7b9399a497176e0d28cc826b3bce48c0 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/31/20031/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 02e31bb..9a3c950 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -390,6 +390,8 @@ goto out; } + mgcp_conn_watchdog_kick(conn_src->conn); + /*conn_dst = mgcp_find_dst_conn(conn_src->conn); if (!conn_dst) { LOGP(DLMGCP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id592d7db7b9399a497176e0d28cc826b3bce48c0 Gerrit-Change-Number: 20031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:09:12 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:09:12 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19945 ) Change subject: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands ...................................................................... Patch Set 2: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732 Gerrit-Change-Number: 19945 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:09:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:11:34 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:11:34 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Deprecate unused IPv4-only API In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19946 ) Change subject: mgcp_client: Deprecate unused IPv4-only API ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc Gerrit-Change-Number: 19946 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:11:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:06 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:21:06 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: copy back Connection Information from MDCX ACK In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19953 ) Change subject: mgcp_client: copy back Connection Information from MDCX ACK ...................................................................... Patch Set 2: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc Gerrit-Change-Number: 19953 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 16:21:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RTP_Emulation: Close previous socket after rebind References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 ) Change subject: library/RTP_Emulation: Close previous socket after rebind ...................................................................... library/RTP_Emulation: Close previous socket after rebind If test calls RTPEM_bind twice, the previosu socket is kept open (ConnId 1) while the new one is assigned to the the expected ConnId for RTP/RTCP packets received (ConnId), however, if remote was already sending packets, it may happen that the port still receives those with ConnId=1, which may make test fail with message: "Received unexpected type from RTP" Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d --- M library/OSMUX_Emulation.ttcn M library/RTP_Emulation.ttcn 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/20032/1 diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn index e1275b9..d31a562 100644 --- a/library/OSMUX_Emulation.ttcn +++ b/library/OSMUX_Emulation.ttcn @@ -451,6 +451,11 @@ [] CTRL.getcall(OsmuxEM_bind:{?,?}) -> param(g_local_host, g_local_port) { g_tx_connected := false; /* will set it back to true upon next connect() call */ + + if (g_osmux_conn_id != -1) { + res := OSMUX_CodecPort_CtrlFunct.f_IPL4_close(OSMUX, g_osmux_conn_id, {udp := {}}); + g_osmux_conn_id := -1; + } res := OSMUX_CodecPort_CtrlFunct.f_IPL4_listen(OSMUX, g_local_host, g_local_port, {udp:={}}); if (not ispresent(res.connId)) { diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index 70604dc..900a196 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -4,7 +4,7 @@ * * act as a RTP source that generates a RTP Stream * * act asaa RTP sink that consumes a RTP Stream * - * for all of the above, we want to be able to + * for all of the above, we want to be able to * * specify the payload type * * specify the interval / sample rate * * create drop-outs in the stream @@ -387,6 +387,11 @@ } g_tx_connected := false; /* will set it back to true upon next connect() call */ + + if (g_rtp_conn_id != -1) { + res := RTP_CodecPort_CtrlFunct.f_IPL4_close(RTP, g_rtp_conn_id, {udp := {}}); + g_rtp_conn_id := -1; + } res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTP, g_local_host, g_local_port, {udp:={}}); if (not ispresent(res.connId)) { @@ -395,6 +400,11 @@ } g_rtp_conn_id := res.connId; tr_rtp.connId := g_rtp_conn_id; + + if (g_rtcp_conn_id != -1) { + res := RTP_CodecPort_CtrlFunct.f_IPL4_close(RTCP, g_rtcp_conn_id, {udp := {}}); + g_rtcp_conn_id := -1; + } res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTCP, g_local_host, g_local_port+1, {udp:={}}); if (not ispresent(res.connId)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d Gerrit-Change-Number: 20032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_o... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 ) Change subject: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_osmux() ...................................................................... mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_osmux() This will be needed once IPv4+IPv6 support is used, since we want to set the remote IP addr in CRCX for convinience to get an IP adr from ther same family during CRCX, while still allowing for testing Osmux CID wildcard value. Change-Id: I3abd80b1c0053004aab3d03e09fada1129a59765 --- M mgw/MGCP_Test.ttcn 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/20033/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 24bfdaf..deb9f3e 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -417,10 +417,13 @@ * part that tells the MGW where we are listening for Osmux streams * that come from the MGW. We get a fully working connection in * one go. */ - rx_hdl := c_OsmuxemDefaultRxHandle; - rx_hdl.cid := flow.osmux_cid; - f_osmuxem_register_rxhandle(pt, rx_hdl); - flow.osmux_cid_sent := true; + if (flow.osmux_cid != -1) { + /* We may still want to negotiate osmux CID later at MDCX */ + rx_hdl := c_OsmuxemDefaultRxHandle; + rx_hdl.cid := flow.osmux_cid; + f_osmuxem_register_rxhandle(pt, rx_hdl); + flow.osmux_cid_sent := true; + } cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux_cid); cmd.sdp := ts_SDP(flow.em.hostname, flow.em.hostname, "23", "42", flow.em.portnr, { int2str(flow.pt) }, attributes); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3abd80b1c0053004aab3d03e09fada1129a59765 Gerrit-Change-Number: 20033 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp ...................................................................... mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp rtpem should be set to BIDIR at the same time where MDCX "sendrecv" is sent, otherwise if MGW sends us RTP packets (because we set the conn to sendrecv) they will be counted incorrectly in stats[0].num_pkts_rx_err_disabled. This issue doesn't trigger in current code because the MGW doesn't know anyway the remote IP address of the other connection until an MDCX is sent to it. However, if for whatever reason the IP address is known (for instance because it is set during CRCX, which will be done in next commits), then RTP messages would be sent and the error counter would be > 0. Change-Id: I653eb75439321f9a488dc56dca5d3fc5a8811547 --- M mgw/MGCP_Test.ttcn 1 file changed, 13 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/20034/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index deb9f3e..429d337 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1754,12 +1754,12 @@ f_sleep(0.5); stats[0] := f_rtpem_stats_get(RTPEM[0]); if (stats[0].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 0"); mtc.stop; } stats[1] := f_rtpem_stats_get(RTPEM[1]); if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 1"); mtc.stop; } @@ -1768,40 +1768,39 @@ f_sleep(1.0); stats[0] := f_rtpem_stats_get(RTPEM[0]); if (stats[0].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 0"); mtc.stop; } stats[1] := f_rtpem_stats_get(RTPEM[1]); if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 1"); mtc.stop; } /* The first leg will now be switched into bidirectional * mode, but we do not expect any data comming back yet. */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + num_pkts_tx[1] := stats[1].num_pkts_tx; f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); f_sleep(0.5); stats[0] := f_rtpem_stats_get(RTPEM[0]); - if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); mtc.stop; } stats[1] := f_rtpem_stats_get(RTPEM[1]); if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 1"); mtc.stop; } /* When the second leg is switched into bidirectional mode * as well, then the MGW will connect the two together and * we should see RTP streams passing through from both ends. */ - f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); stats[0] := f_rtpem_stats_get(RTPEM[0]); - num_pkts_tx[0] := stats[0].num_pkts_tx - stats[1] := f_rtpem_stats_get(RTPEM[1]); - num_pkts_tx[1] := stats[1].num_pkts_tx - + num_pkts_tx[0] := stats[0].num_pkts_tx; f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); f_sleep(2.0); @@ -1810,13 +1809,13 @@ temp := stats[0].num_pkts_tx - num_pkts_tx[0] - stats[1].num_pkts_rx; if (temp > 3 or temp < -3) { - setverdict(fail, "number of packets not within normal parameters"); + setverdict(fail, "number of packets not within normal parameters:", temp); mtc.stop; } temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx; if (temp > 3 or temp < -3) { - setverdict(fail, "number of packets not within normal parameters"); + setverdict(fail, "number of packets not within normal parameters:", temp); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I653eb75439321f9a488dc56dca5d3fc5a8811547 Gerrit-Change-Number: 20034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux ...................................................................... mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux rtpem should be set to BIDIR at the same time where MDCX "sendrecv" is sent, otherwise if MGW sends us RTP packets (because we set the conn to sendrecv) they will be counted incorrectly in stats[0].num_pkts_rx_err_disabled. This issue doesn't trigger in current code because the MGW doesn't know anyway the remote IP address of the other connection until an MDCX is sent to it. However, if for whatever reason the IP address is known (for instance because it is set during CRCX, which will be done in next commits), then RTP messages would be sent and the error counter would be > 0. Change-Id: I8f2c4e497e522fc17e5cfe76987f802265c486ab --- M mgw/MGCP_Test.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/20035/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 429d337..c6fe15b 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1331,6 +1331,9 @@ /* The first leg will now be switched into bidirectional * mode, but we do not expect any data comming back yet. */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + stats_osmux := f_osmuxem_stats_get(OsmuxEM); + num_pkts_tx[1] := stats_osmux.num_pkts_tx; f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); f_sleep(0.5); stats_rtp := f_rtpem_stats_get(RTPEM[0]); @@ -1347,12 +1350,9 @@ /* When the second leg is switched into bidirectional mode * as well, then the MGW will connect the two together and * we should see RTP streams passing through from both ends. */ - f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); f_osmuxem_mode(OsmuxEM, OSMUXEM_MODE_BIDIR); stats_rtp := f_rtpem_stats_get(RTPEM[0]); - num_pkts_tx[0] := stats_rtp.num_pkts_tx - stats_osmux := f_osmuxem_stats_get(OsmuxEM); - num_pkts_tx[1] := stats_osmux.num_pkts_tx + num_pkts_tx[0] := stats_rtp.num_pkts_tx; if (crcx_osmux_wildcard) { /* For now we must set same CID as the MGW recvCID, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c4e497e522fc17e5cfe76987f802265c486ab Gerrit-Change-Number: 20035 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 ) Change subject: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp ...................................................................... mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp Send the remote address to MGW so it knows which IP version to return during CRCX ACK. This actually better suits the test, since there's less point in checking whether we receive something if we never pass the IP/port to MGW. In any case, the "recvonly" should still tell MGW to refrain from sending stuff to us, so we are really testing that here. Change-Id: Id3452cecf7fb281e5e46471f7f53983c08c6bfdf --- M mgw/MGCP_Test.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/20036/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index c6fe15b..47a7690 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1593,7 +1593,7 @@ f_init(ep); flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1")); flow.em.portnr := 10000; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow, false); + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow, true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3452cecf7fb281e5e46471f7f53983c08c6bfdf Gerrit-Change-Number: 20036 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Rename IP address module parameter specifying IP version References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 ) Change subject: mgw: Rename IP address module parameter specifying IP version ...................................................................... mgw: Rename IP address module parameter specifying IP version Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 --- M mgw/MGCP_Test.default M mgw/MGCP_Test.ttcn 2 files changed, 33 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/20037/1 diff --git a/mgw/MGCP_Test.default b/mgw/MGCP_Test.default index 4336033..35f7ed0 100644 --- a/mgw/MGCP_Test.default +++ b/mgw/MGCP_Test.default @@ -14,9 +14,9 @@ [MODULE_PARAMETERS] mp_local_udp_port := 2727; -mp_local_ip:= "127.0.0.1"; +mp_local_ipv4:= "127.0.0.1"; mp_remote_udp_port := 2427; -mp_remote_ip:= "127.0.0.1"; +mp_remote_ipv4:= "127.0.0.1"; Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMGW"; [MAIN_CONTROLLER] diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 47a7690..c41466a 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -64,9 +64,9 @@ * default values assigned below are used */ modulepar { PortNumber mp_local_udp_port := 2727; - charstring mp_local_ip := "127.0.0.1"; + charstring mp_local_ipv4 := "127.0.0.1"; PortNumber mp_remote_udp_port := 2427; - charstring mp_remote_ip := "127.0.0.1"; + charstring mp_remote_ipv4 := "127.0.0.1"; PortNumber mp_local_rtp_port_base := 10000; PortNumber mp_local_osmux_port := 1985; } @@ -124,7 +124,7 @@ /* connect the MGCP test port using the given * source/destionation ip/port and store the connection id in g_mgcp_conn_id * */ - res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {} }); + res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ipv4, mp_remote_udp_port, mp_local_ipv4, mp_local_udp_port, 0, { udp := {} }); if (not ispresent(res.connId)) { setverdict(fail, "Could not connect MGCP, check your configuration"); mtc.stop; @@ -224,9 +224,9 @@ function tr_MGCP_RecvFrom_R(template MgcpResponse resp) runs on dummy_CT return template MGCP_RecvFrom { var template MGCP_RecvFrom mrf := { connId := g_mgcp_conn_id, - remName := mp_remote_ip, + remName := mp_remote_ipv4, remPort := mp_remote_udp_port, - locName := mp_local_ip, + locName := mp_local_ipv4, locPort := mp_local_udp_port, msg := { response := resp } } @@ -1080,7 +1080,7 @@ var OsmuxTxHandle tx_hdl; f_init(ep, true); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1")); flow.em.portnr := mp_local_osmux_port; flow.osmux_cid := -1; f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow, false); @@ -1117,7 +1117,7 @@ var OsmuxTxHandle tx_hdl; f_init(ep, true); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := mp_local_osmux_port; flow.osmux_cid := 2; f_flow_create_osmux(OsmuxEM, ep, call_id, "loopback", flow); @@ -1198,7 +1198,7 @@ f_init(ep, true); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1209,7 +1209,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; flow[1].osmux_cid := 2; flow[1].osmux_cfg := c_OsmuxemDefaultCfg; @@ -1277,7 +1277,7 @@ f_init(ep, true); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1290,7 +1290,7 @@ /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; if (crcx_osmux_wildcard) { flow[1].osmux_cid := -1; @@ -1591,7 +1591,7 @@ var RtpemStats stats; f_init(ep); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow, true); @@ -1629,7 +1629,7 @@ var RtpemStats stats; f_init(ep); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "loopback", flow); @@ -1663,13 +1663,13 @@ f_init(ep); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, pt_a, codec_name_a)); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, pt_a, codec_name_a)); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, pt_b, codec_name_b)); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, pt_b, codec_name_b)); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]); @@ -1739,13 +1739,13 @@ f_init(ep); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 3, "GSM/8000/1")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], false); /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 3, "GSM/8000/1")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], false); @@ -1841,13 +1841,13 @@ f_init(ep); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 98, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 98, "AMR/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 98, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 98, "AMR/8000")); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]); @@ -1857,8 +1857,8 @@ f_sleep(0.5); /* Start inserting unsolicited RTP packets */ - f_rtpem_bind(RTPEM[2], mp_local_ip, unsolicited_port); - f_rtpem_connect(RTPEM[2], mp_remote_ip, flow[0].mgw.portnr); + f_rtpem_bind(RTPEM[2], mp_local_ipv4, unsolicited_port); + f_rtpem_connect(RTPEM[2], mp_remote_ipv4, flow[0].mgw.portnr); f_rtpem_mode(RTPEM[2], RTPEM_MODE_TXONLY); f_sleep(0.5); @@ -1894,13 +1894,13 @@ f_init(ep); /* First connection (BTS) */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "GSM-EFR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "GSM-EFR/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* Second connection (PBX) */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "GSM-EFR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "GSM-EFR/8000")); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]); @@ -1920,8 +1920,8 @@ * transmitting for a while. We simulate this by injecting * some unsolicited packets on the behalf of the old source, * (old remote port) */ - f_rtpem_bind(RTPEM[2], mp_local_ip, port_old); - f_rtpem_connect(RTPEM[2], mp_remote_ip, flow[0].mgw.portnr); + f_rtpem_bind(RTPEM[2], mp_local_ipv4, port_old); + f_rtpem_connect(RTPEM[2], mp_remote_ipv4, flow[0].mgw.portnr); f_rtpem_mode(RTPEM[2], RTPEM_MODE_TXONLY); f_sleep(1.0); f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE); @@ -1968,7 +1968,7 @@ f_vty_transceive(MGWVTY, "rtp-patch rfc5993hr"); /* Connection #0 (Bidirectional) */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; flow[0].rtp_cfg := c_RtpemDefaultCfg; @@ -1978,7 +1978,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* Connection #1 (Bidirectional) */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000")); flow[1].em.portnr := 20000; flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; @@ -2033,7 +2033,7 @@ f_init(ep); /* Connection #0 (Bidirectional) */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; flow[0].rtp_cfg := c_RtpemDefaultCfg; @@ -2044,7 +2044,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* Connection #1 (Bidirectional) */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); flow[1].em.portnr := 20000; flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; @@ -2123,7 +2123,7 @@ f_vty_config(MGWVTY, "mgcp", "conn-timeout 1"); /* reset in f_init_vty() */ log("Sending RTP data for 1.5s"); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "loopback", flow); f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); @@ -2208,7 +2208,7 @@ var RtpemStats stats; f_init(ep); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "loopback", flow); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 Gerrit-Change-Number: 20037 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 addresses in MGCP messages References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 ) Change subject: mgw: Test IPv6 addresses in MGCP messages ...................................................................... mgw: Test IPv6 addresses in MGCP messages These tests verify that osmo-mgw handles requests no matter of IP version used in the remote address. Change-Id: Ib134dda5a8f7c8f50968b6ce330f9986ae72575d --- M mgw/MGCP_Test.ttcn M mgw/osmo-mgw.cfg 2 files changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/20038/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index c41466a..b767dd4 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2230,6 +2230,72 @@ setverdict(pass); } + /* test valid CRCX then MDCX with IPv4 address, MGW provides a local IPv4 too */ + testcase TC_crcx_mdcx_ip4() runs on dummy_CT { + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var template MgcpCommand cmd; + var MgcpResponse resp; + var MgcpCallId call_id := '1234'H; + var MgcpConnectionId conn_id; + + f_init(ep); + + /* create the connection on the MGW */ + cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); + conn_id := extract_conn_id(resp); + + cmd := ts_MDCX(get_next_trans_id(), ep, "sendrecv", call_id, conn_id); + cmd.sdp := ts_SDP("127.0.0.2", "127.0.0.1", "23", "42", 2344, { "98" }, + { valueof(ts_SDP_rtpmap(98, "AMR/8000")), + valueof(ts_SDP_ptime(20)) }); + resp := mgcp_transceive_mgw(cmd, tr_MDCX_ACK); + + if (not ispresent(resp.sdp) or not ispresent(resp.sdp.connection)) { + setverdict(fail, "No RemoteConnection info found in MDCX ACK!"); + } + if (not match(resp.sdp.connection, ts_SDP_connection_IP("127.0.0.1", "IP4"))) { + setverdict(fail, "Wrong RemoteConnection in MDCX ACK!", resp.sdp.connection); + } + + /* clean-up */ + f_dlcx_ok(ep, call_id); + setverdict(pass); + } + + /* test valid CRCX then MDCX with IPv6 address, MGW provides a local IPv6 too */ + testcase TC_crcx_mdcx_ip6() runs on dummy_CT { + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var template MgcpCommand cmd; + var MgcpResponse resp; + var MgcpCallId call_id := '1234'H; + var MgcpConnectionId conn_id; + + f_init(ep); + + /* create the connection on the MGW */ + cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); + conn_id := extract_conn_id(resp); + + cmd := ts_MDCX(get_next_trans_id(), ep, "sendrecv", call_id, conn_id); + cmd.sdp := ts_SDP("::2", "::1", "23", "42", 2344, { "98" }, + { valueof(ts_SDP_rtpmap(98, "AMR/8000")), + valueof(ts_SDP_ptime(20)) }); + resp := mgcp_transceive_mgw(cmd, tr_MDCX_ACK); + + if (not ispresent(resp.sdp) or not ispresent(resp.sdp.connection)) { + setverdict(fail, "No RemoteConnection info found in MDCX ACK!"); + } + if (not match(resp.sdp.connection, ts_SDP_connection_IP("::1", "IP6"))) { + setverdict(fail, "Wrong RemoteConnection in MDCX ACK!", resp.sdp.connection); + } + + /* clean-up */ + f_dlcx_ok(ep, call_id); + setverdict(pass); + } + control { execute(TC_selftest()); execute(TC_crcx()); @@ -2290,5 +2356,7 @@ execute(TC_e1_crcx_with_overlap()); execute(TC_e1_crcx_loopback()); + execute(TC_crcx_mdcx_ip4()); + execute(TC_crcx_mdcx_ip6()); } } diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index edc8190..beb6fdf 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -22,6 +22,7 @@ bind port 2427 rtp port-range 4002 16000 rtp bind-ip 127.0.0.1 + rtp bind-ip-v6 ::1 rtp ip-probing rtp ip-dscp 184 no rtp keep-alive -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib134dda5a8f7c8f50968b6ce330f9986ae72575d Gerrit-Change-Number: 20038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:21:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 RTP streams in osmo-mgw References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 ) Change subject: mgw: Test IPv6 RTP streams in osmo-mgw ...................................................................... mgw: Test IPv6 RTP streams in osmo-mgw Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 --- M mgw/MGCP_Test.ttcn 1 file changed, 83 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/20039/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index b767dd4..4be034b 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -65,8 +65,10 @@ modulepar { PortNumber mp_local_udp_port := 2727; charstring mp_local_ipv4 := "127.0.0.1"; + charstring mp_local_ipv6 := "::1"; PortNumber mp_remote_udp_port := 2427; charstring mp_remote_ipv4 := "127.0.0.1"; + charstring mp_remote_ipv6 := "::1"; PortNumber mp_local_rtp_port_base := 10000; PortNumber mp_local_osmux_port := 1985; } @@ -1186,7 +1188,9 @@ return true; } - function f_TC_two_crcx_and_rtp_osmux(boolean bidir) runs on dummy_CT { + function f_TC_two_crcx_and_rtp_osmux(boolean bidir, + charstring local_ip_rtp, charstring remote_ip_rtp, + charstring local_ip_osmux, charstring remote_ip_osmux) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats_rtp; var OsmuxemStats stats_osmux; @@ -1198,7 +1202,7 @@ f_init(ep, true); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(local_ip_rtp, remote_ip_rtp, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1209,7 +1213,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; flow[1].osmux_cid := 2; flow[1].osmux_cfg := c_OsmuxemDefaultCfg; @@ -1254,17 +1258,37 @@ /* create one RTP and one OSmux emulations; create two connections on MGW EP, exchange some data */ testcase TC_two_crcx_and_rtp_osmux() runs on dummy_CT { - f_TC_two_crcx_and_rtp_osmux(false); + f_TC_two_crcx_and_rtp_osmux(false, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); } /* create one RTP and one OSmux emulations; create two connections on MGW EP, * exchange some data in both directions */ testcase TC_two_crcx_and_rtp_osmux_bidir() runs on dummy_CT { - f_TC_two_crcx_and_rtp_osmux(true); + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + + /* Same as TC_two_crcx_and_rtp_osmux_bidir, but using IPv6 */ + testcase TC_two_crcx_and_rtp_osmux_bidir_ipv6() runs on dummy_CT { + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_and_rtp_osmux_bidir, but using IPv4 (RTP) and IPv6 (Osmux) */ + testcase TC_two_crcx_and_rtp_osmux_bidir_ipv4_ipv6() runs on dummy_CT { + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_and_rtp_osmux_bidir, but using IPv6 (RTP) and IPv4 (Osmux) */ + testcase TC_two_crcx_and_rtp_osmux_bidir_ipv6_ipv4() runs on dummy_CT { + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv4, mp_remote_ipv4); } - function f_two_crcx_mdcx_and_rtp_osmux(boolean crcx_osmux_wildcard) runs on dummy_CT { + function f_two_crcx_mdcx_and_rtp_osmux(boolean crcx_osmux_wildcard, + charstring local_ip_rtp, charstring remote_ip_rtp, + charstring local_ip_osmux, charstring remote_ip_osmux) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats_rtp; var OsmuxemStats stats_osmux; @@ -1277,7 +1301,7 @@ f_init(ep, true); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(local_ip_rtp, remote_ip_rtp, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1285,12 +1309,12 @@ flow[0].rtp_cfg.tx_fixed_payload := flow[0].rtp_cfg.rx_fixed_payload; /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], false); + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; if (crcx_osmux_wildcard) { flow[1].osmux_cid := -1; @@ -1298,7 +1322,7 @@ flow[1].osmux_cid := 2; } flow[1].osmux_cfg := c_OsmuxemDefaultCfg; - f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow[1], false); + f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow[1], true); /* The first leg starts transmitting */ @@ -1393,14 +1417,32 @@ directions. Create CRCX with wildcard Osmux CID and set it later during MDCX. This is similar to how MSC sets up the call in AoIP. */ testcase TC_two_crcx_mdcx_and_rtp_osmux_wildcard() runs on dummy_CT { - f_two_crcx_mdcx_and_rtp_osmux(true); + f_two_crcx_mdcx_and_rtp_osmux(true, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); } /* create one RTP and one OSmux emulations and pass data in both directions. Create CRCX with fixed Osmux CID and keep it during MDCX. This is similar to how BSC sets up the call in AoIP. */ testcase TC_two_crcx_mdcx_and_rtp_osmux_fixed() runs on dummy_CT { - f_two_crcx_mdcx_and_rtp_osmux(false); + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + + /* Same as TC_two_crcx_mdcx_and_rtp_osmux_wildcard, but using IPv6. */ + testcase TC_two_crcx_mdcx_and_rtp_osmux_ipv6() runs on dummy_CT { + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_mdcx_and_rtp_osmux_wildcard, but using IPv4 (RTP) and IPv6 (Osmux). */ + testcase TC_two_crcx_mdcx_and_rtp_osmux_ipv4_ipv6() runs on dummy_CT { + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_mdcx_and_rtp_osmux_wildcard, but using IPv6 (RTP) and IPv4 (Osmux). */ + testcase TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4() runs on dummy_CT { + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv4, mp_remote_ipv4); } function f_crcx_and_dlcx_ep_callid_connid(MgcpEndpoint ep, MgcpCallId call_id) runs on dummy_CT { @@ -1727,7 +1769,8 @@ } /* create two local RTP emulations and pass data in both directions */ - testcase TC_two_crcx_mdcx_and_rtp() runs on dummy_CT { + function f_tc_two_crcx_mdcx_and_rtp(charstring local_ip_a, charstring remote_ip_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; var MgcpResponse resp; @@ -1739,15 +1782,15 @@ f_init(ep); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 3, "GSM/8000/1")); flow[0].em.portnr := 10000; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], false); + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 3, "GSM/8000/1")); flow[1].em.portnr := 20000; - f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], false); + f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); /* The first leg starts transmitting */ f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); @@ -1828,6 +1871,21 @@ setverdict(pass); } + testcase TC_two_crcx_mdcx_and_rtp() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_rtp(mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + + testcase TC_two_crcx_mdcx_and_rtp_ipv6() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_rtp(mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv6, mp_remote_ipv6); + } + + testcase TC_two_crcx_mdcx_and_rtp_ipv4_ipv6() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_rtp(mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv6, mp_remote_ipv6); + } + /* Test what happens when two RTP streams from different sources target * a single connection. Is the unsolicited stream properly ignored? */ testcase TC_two_crcx_and_unsolicited_rtp() runs on dummy_CT { @@ -2358,5 +2416,13 @@ execute(TC_crcx_mdcx_ip4()); execute(TC_crcx_mdcx_ip6()); + execute(TC_two_crcx_mdcx_and_rtp_ipv4_ipv6()); + execute(TC_two_crcx_mdcx_and_rtp_ipv6()); + execute(TC_two_crcx_and_rtp_osmux_bidir_ipv6()); + execute(TC_two_crcx_and_rtp_osmux_bidir_ipv4_ipv6()); + execute(TC_two_crcx_and_rtp_osmux_bidir_ipv6_ipv4()); + execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6()); + execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv4_ipv6()); + execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 Gerrit-Change-Number: 20039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:21:55 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:21:55 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix mgcp_rtp_end field description comment In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19968 ) Change subject: mgw: Fix mgcp_rtp_end field description comment ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ieb044daaaa47572cd9a2524ea69e903200527d17 Gerrit-Change-Number: 19968 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:21:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:25:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 16:25:29 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 23: Code-Review+1 (6 comments) I would say let's merge it soon unless somebody has major concerns. We then can start porting/writing applications to it and still modifiy the API as needed until we tag the next release. But then, we will need to tag releases at the end of the month - maybe we should create a 'ns2' branch of libosmocore.git and push this change there until everything has been ported and we can merge ns2 to master? https://gerrit.osmocom.org/c/libosmocore/+/19417/23/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/23/include/osmocom/gprs/gprs_ns2.h at 86 PS23, Line 86: link_selector_parameter I don't think we should have pointers in primitives. Right now the idea of primitives is that you could memcpy them, without having to worry about reference counts to other objects. https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/Makefile.am File src/gb/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/Makefile.am at 25 PS23, Line 25: gprs_ns2_message.c gprs_ns2_vty.c \ I'm not sure if it wouldn't be worth to move this code to a new library? But then the problem is, the BSSGP code is still in libosmogb and hence we'd need both anyway. So keep as-is. https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/gprs_ns2.c at 187 PS23, Line 187: oid gprs_ns2_set_log_ss(int ss) : { : DNS = ss; : } we could just add a global "DLNS" to libosmocore, but we can also keep this style. https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/gprs_ns2.c at 876 PS23, Line 876: /* TODO: remove this global, why the hell do I use it */ : static bool gprs_fsm_vc_registered = false; : static bool gprs_fsm_sns_registered = false; indeed ;) https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/gprs_ns2_message.c File src/gb/gprs_ns2_message.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/gprs_ns2_message.c at 64 PS23, Line 64: int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) we have a more data driven approach for this, see https://git.osmocom.org/libosmo-sccp/tree/src/m3ua.c#n129 which is then executed by https://git.osmocom.org/libosmo-sccp/tree/src/xua_msg.c#n449 That is tied particularly to the xUA series of protocols, but I long wanted to expand this to our normal tlvp style protocol parsers. So something similar in spirit that is part of libosmocore and whihc can be used by arious protocol modules all around. In any case, the code here can and should stay as-is. We can switch to a different data-driven verification codebase later on. https://gerrit.osmocom.org/c/libosmocore/+/19417/23/src/gb/gprs_ns2_message.c at 74 PS23, Line 74: int gprs_ns2_validate_reset_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) shouldn't all these be 'static' and called by the dispatcher function below? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 23 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 16:25:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:31:51 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 8 Sep 2020 16:31:51 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: handle failed transfers References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 ) Change subject: usb: handle failed transfers ...................................................................... usb: handle failed transfers This fixes the crash with external power if usb is disconected and plugged in again, upon ep reset the completion cbs are called, but we can obviously not interact with those EPs at that time and resubmit buffers. Change-Id: Icff17673b4d1d1616ee733580bdd6b5203b87139 Closes: SYS#4908 --- M sysmoOCTSIM/main.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/40/20040/1 diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 08f38ec..101af30 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -230,6 +230,9 @@ llist_add_tail_at(&msg->list, &g_ccid_s.out_ep.list); g_ccid_s.out_ep.in_progress = NULL; + if(code != USB_XFER_DONE) + return; + /* submit another [free] msgb to receive the next transfer */ submit_next_out(); } @@ -244,6 +247,9 @@ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); g_ccid_s.in_ep.in_progress = NULL; + if(code != USB_XFER_DONE) + return; + /* submit the next pending to-be-transmitted msgb (if any) */ submit_next_in(); } @@ -258,6 +264,9 @@ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); g_ccid_s.irq_ep.in_progress = NULL; + if(code != USB_XFER_DONE) + return; + /* submit the next pending to-be-transmitted msgb (if any) */ submit_next_irq(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icff17673b4d1d1616ee733580bdd6b5203b87139 Gerrit-Change-Number: 20040 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:31:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 16:31:56 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: Hello dexter, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 to look at the new patch set (#2). Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Support sending IPv6 Transport Address in Assignment Command Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 --- M src/libmsc/ran_msg_a.c 1 file changed, 40 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/19922/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:34:46 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:34:46 +0000 Subject: Change in osmo-mgw[master]: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19970 ) Change subject: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command ...................................................................... Patch Set 2: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8ed94bd3f674f498e6ba315f44a351fff9c1be15 Gerrit-Change-Number: 19970 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:34:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:35:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 16:35:39 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: handle failed transfers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 ) Change subject: usb: handle failed transfers ...................................................................... Patch Set 1: Code-Review+1 looks good. Did you try it on your board? In the bug you stated "presumably". I'm happy to give it a try here on my board. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icff17673b4d1d1616ee733580bdd6b5203b87139 Gerrit-Change-Number: 20040 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:35:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:39:37 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:39:37 +0000 Subject: Change in osmo-mgw[master]: mgw: Find and store RTP conn local_addr once during CRCX handling In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19971 ) Change subject: mgw: Find and store RTP conn local_addr once during CRCX handling ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I803b99c5e5fe0f92a5bf6796d8c25df88d1608e6 Gerrit-Change-Number: 19971 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:39:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:42:54 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 8 Sep 2020 16:42:54 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: handle failed transfers In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 ) Change subject: usb: handle failed transfers ...................................................................... Patch Set 1: Yes, that is why i know how it fails. In theory we should do a full device reset to ensure no state is left over when replugging the octsim, but resetting during usb resets oviously leads to resetception, so i don't know if there is anything else broken after plug-unplug cycles. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icff17673b4d1d1616ee733580bdd6b5203b87139 Gerrit-Change-Number: 20040 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:42:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:44:08 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:44:08 +0000 Subject: Change in osmo-mgw[master]: mgw: Announce and rebind new local address if change required during ... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19972 ) Change subject: mgw: Announce and rebind new local address if change required during MDCX ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iaed424e2c209e1753e1f579752fc684aaad7a512 Gerrit-Change-Number: 19972 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:44:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:53:35 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:53:35 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Avoid sending packets on recvonly connection In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20029 ) Change subject: mgw: osmux: Avoid sending packets on recvonly connection ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87b1fb7d73cbbb2a5d4d8a40a9527a3e05d9947b Gerrit-Change-Number: 20029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 08 Sep 2020 16:53:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 16:58:51 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 16:58:51 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19949 ) Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19949/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/19949/4//COMMIT_MSG at 10 PS4, Line 10: Redmine task number missing (related). Unfortunately I did not check in the other patches... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 16:58:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:02:04 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 17:02:04 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19922/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/19922/1//COMMIT_MSG at 9 PS1, Line 9: Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 task number? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 08 Sep 2020 17:02:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:27:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 8 Sep 2020 17:27:26 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#24). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,133 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/24 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 24 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:54:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:54:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow submitting and parsing IPv6 addr in SDP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19888 ) Change subject: mgcp_client: Allow submitting and parsing IPv6 addr in SDP ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I936bf57d37f5f0607dfe7fc66c37e424c3793f9b Gerrit-Change-Number: 19888 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:54:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:54:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:54:33 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19920 ) Change subject: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1be6f3b71486ce1782ba6b8c62f25145b42ec894 Gerrit-Change-Number: 19920 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:54:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:54:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:54:37 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19945 ) Change subject: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732 Gerrit-Change-Number: 19945 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:54:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:54:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:54:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Deprecate unused IPv4-only API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19946 ) Change subject: mgcp_client: Deprecate unused IPv4-only API ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc Gerrit-Change-Number: 19946 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:54:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:54:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:54:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: copy back Connection Information from MDCX ACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19953 ) Change subject: mgcp_client: copy back Connection Information from MDCX ACK ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc Gerrit-Change-Number: 19953 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:54:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:00 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19969 ) Change subject: mgw: Initial IPv6 support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:55:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:04 +0000 Subject: Change in osmo-mgw[master]: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19970 ) Change subject: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8ed94bd3f674f498e6ba315f44a351fff9c1be15 Gerrit-Change-Number: 19970 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:55:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:12 +0000 Subject: Change in osmo-mgw[master]: mgw: Find and store RTP conn local_addr once during CRCX handling In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19971 ) Change subject: mgw: Find and store RTP conn local_addr once during CRCX handling ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I803b99c5e5fe0f92a5bf6796d8c25df88d1608e6 Gerrit-Change-Number: 19971 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:55:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:16 +0000 Subject: Change in osmo-mgw[master]: mgw: Announce and rebind new local address if change required during ... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19972 ) Change subject: mgw: Announce and rebind new local address if change required during MDCX ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iaed424e2c209e1753e1f579752fc684aaad7a512 Gerrit-Change-Number: 19972 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:55:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:30 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow submitting and parsing IPv6 addr in SDP In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19888 ) Change subject: mgcp_client: Allow submitting and parsing IPv6 addr in SDP ...................................................................... mgcp_client: Allow submitting and parsing IPv6 addr in SDP Existing mgcp_client_test code required the '.' to trigger the same code path, since with this commit we do extra checks and without a dot the address is not accepted as IPv4 by osmo_ip_str_type(). Change-Id: I936bf57d37f5f0607dfe7fc66c37e424c3793f9b --- M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.err M tests/mgcp_client/mgcp_client_test.ok 4 files changed, 211 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 146a59d..df84226 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -370,22 +371,37 @@ /* Parse a line like "c=IN IP4 10.11.12.13" */ static int mgcp_parse_audio_ip(struct mgcp_response *r, const char *line) { - struct in_addr ip_test; + struct in6_addr ip_test; + bool is_ipv6; - if (strlen(line) < 16) + if (strncmp("c=IN IP", line, 7) != 0) goto response_parse_failure; - - /* The current implementation strictly supports IPV4 only ! */ - if (memcmp("c=IN IP4 ", line, 9) != 0) + line += 7; + if (*line == '6') + is_ipv6 = true; + else if (*line == '4') + is_ipv6 = false; + else goto response_parse_failure; - - /* Extract IP-Address */ - osmo_strlcpy(r->audio_ip, line + 9, sizeof(r->audio_ip)); - - /* Check IP-Address */ - if (inet_aton(r->audio_ip, &ip_test) == 0) + line++; + if (*line != ' ') goto response_parse_failure; + line++; + /* Extract and check IP-Address */ + if (is_ipv6) { + /* 45 = INET6_ADDRSTRLEN -1 */ + if (sscanf(line, "%45s", r->audio_ip) != 1) + goto response_parse_failure; + if (inet_pton(AF_INET6, r->audio_ip, &ip_test) != 1) + goto response_parse_failure; + } else { + /* 15 = INET_ADDRSTRLEN -1 */ + if (sscanf(line, "%15s", r->audio_ip) != 1) + goto response_parse_failure; + if (inet_pton(AF_INET, r->audio_ip, &ip_test) != 1) + goto response_parse_failure; + } return 0; response_parse_failure: @@ -1122,6 +1138,7 @@ unsigned int i; int rc = 0; char local_ip[INET6_ADDRSTRLEN]; + int local_ip_family, audio_ip_family; const char *codec; unsigned int pt; @@ -1138,10 +1155,21 @@ msgb_free(msg); return -2; } + local_ip_family = osmo_ip_str_type(local_ip); + if (local_ip_family == AF_UNSPEC) { + msgb_free(msg); + return -2; + } + audio_ip_family = osmo_ip_str_type(mgcp_msg->audio_ip); + if (audio_ip_family == AF_UNSPEC) { + msgb_free(msg); + return -2; + } /* Add owner/creator (SDP) */ - rc += msgb_printf(msg, "o=- %x 23 IN IP4 %s\r\n", - mgcp_msg->call_id, local_ip); + rc += msgb_printf(msg, "o=- %x 23 IN IP%c %s\r\n", mgcp_msg->call_id, + local_ip_family == AF_INET6 ? '6' : '4', + local_ip); /* Add session name (none) */ rc += msgb_printf(msg, "s=-\r\n"); @@ -1159,7 +1187,9 @@ msgb_free(msg); return -2; } - rc += msgb_printf(msg, "c=IN IP4 %s\r\n", mgcp_msg->audio_ip); + rc += msgb_printf(msg, "c=IN IP%c %s\r\n", + audio_ip_family == AF_INET6 ? '6' : '4', + mgcp_msg->audio_ip); /* Add time description, active time (SDP) */ rc += msgb_printf(msg, "t=0 0\r\n"); diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index db9f4f8..e2e8bf8 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -294,11 +294,23 @@ MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE | MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT); memset(audio_ip_overflow, 'X', sizeof(audio_ip_overflow)); + audio_ip_overflow[1] = '.'; audio_ip_overflow[sizeof(audio_ip_overflow) - 1] = '\0'; mgcp_msg.audio_ip = audio_ip_overflow; msg = mgcp_msg_gen(mgcp, &mgcp_msg); OSMO_ASSERT(msg == NULL); + printf("IPv6 test:\n"); + mgcp_msg.verb = MGCP_VERB_MDCX; + mgcp_msg.presence = + (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | + MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE | + MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT); + mgcp_msg.audio_ip = "2001:db8:1::ab9:c0a8:102"; + mgcp->actual.remote_addr = "::1"; + msg = mgcp_msg_gen(mgcp, &mgcp_msg); + printf("%s\n", (char *)msg->data); + printf("\n"); msgb_free(msg); } @@ -413,6 +425,66 @@ "m=audio 23\r\n", .expect_rc = 0, }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP4 1.2.3.4\r\n", + .expect_params = { + .audio_ip = "1.2.3.4", + }, + .expect_rc = 0, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP6 2001:db8:1::ab9:c0a8:102\r\n", + .expect_params = { + .audio_ip = "2001:db8:1::ab9:c0a8:102", + }, + .expect_rc = 0, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP6 1.2.3.4\r\n", + .expect_rc = -22, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP4 ::1\r\n", + .expect_rc = -22, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP4 notanip\r\n", + .expect_rc = -22, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP4 1.2.3.4.5.6\r\n", + .expect_rc = -22, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP4 1.2 .3\r\n", + .expect_rc = -22, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP4 1.2 .3\r\n", + .expect_rc = -22, + }, + { + .body = "some mgcp header data\r\nand header params" + "\r\n\r\n" + "c=IN IP4 \r\n", + .expect_rc = -22, + }, }; void test_sdp_section_start() @@ -443,7 +515,12 @@ continue; } - fprintf(stderr, "got audio_port=%u\n", t->expect_params.audio_port); + fprintf(stderr, "got audio_ip=\"%s\"\n", r->audio_ip); + if (strcmp(r->audio_ip, t->expect_params.audio_ip)) { + fprintf(stderr, "FAIL: Expected audio_ip=\"%s\"\n", t->expect_params.audio_ip); + failures++; + } + fprintf(stderr, "got audio_port=%u\n", r->audio_port); if (r->audio_port != t->expect_params.audio_port) { fprintf(stderr, "FAIL: Expected audio_port=%u\n", t->expect_params.audio_port); failures++; diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index e114f79..ac13f03 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -19,55 +19,112 @@ body: "" DLMGCP MGCP response contains no SDP parameters got rc=0 +got audio_ip="" got audio_port=0 test_sdp_section_start() test [1]: body: "\n\n" got rc=0 +got audio_ip="" got audio_port=0 test_sdp_section_start() test [2]: body: "\r\n\r\n" got rc=0 +got audio_ip="" got audio_port=0 test_sdp_section_start() test [3]: body: "\n\r\n\r" got rc=0 +got audio_ip="" got audio_port=0 test_sdp_section_start() test [4]: body: "some mgcp header data\r\nand header params\n\nm=audio 23\r\n" got rc=0 +got audio_ip="" got audio_port=23 test_sdp_section_start() test [5]: body: "some mgcp header data\r\nand header params\r\n\r\nm=audio 23\r\n" got rc=0 +got audio_ip="" got audio_port=23 test_sdp_section_start() test [6]: body: "some mgcp header data\r\nand header params\n\r\n\rm=audio 23\r\n" got rc=0 +got audio_ip="" got audio_port=23 test_sdp_section_start() test [7]: body: "some mgcp header data\r\nand header params\n\r\nm=audio 23\r\n" DLMGCP MGCP response contains no SDP parameters got rc=0 +got audio_ip="" got audio_port=0 test_sdp_section_start() test [8]: body: "some mgcp header data\r\nand header params\r\n\rm=audio 23\r\n" DLMGCP MGCP response contains no SDP parameters got rc=0 +got audio_ip="" got audio_port=0 test_sdp_section_start() test [9]: body: "some mgcp header data\r\nand header params\n\r\rm=audio 23\r\n" DLMGCP MGCP response contains no SDP parameters got rc=0 +got audio_ip="" got audio_port=0 + +test_sdp_section_start() test [10]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP4 1.2.3.4\r\n" +got rc=0 +got audio_ip="1.2.3.4" +got audio_port=0 + +test_sdp_section_start() test [11]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP6 2001:db8:1::ab9:c0a8:102\r\n" +got rc=0 +got audio_ip="2001:db8:1::ab9:c0a8:102" +got audio_port=0 + +test_sdp_section_start() test [12]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP6 1.2.3.4\r\n" +DLMGCP Failed to parse MGCP response header (audio ip) +got rc=-22 + +test_sdp_section_start() test [13]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP4 ::1\r\n" +DLMGCP Failed to parse MGCP response header (audio ip) +got rc=-22 + +test_sdp_section_start() test [14]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP4 notanip\r\n" +DLMGCP Failed to parse MGCP response header (audio ip) +got rc=-22 + +test_sdp_section_start() test [15]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP4 1.2.3.4.5.6\r\n" +DLMGCP Failed to parse MGCP response header (audio ip) +got rc=-22 + +test_sdp_section_start() test [16]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP4 1.2 .3\r\n" +DLMGCP Failed to parse MGCP response header (audio ip) +got rc=-22 + +test_sdp_section_start() test [17]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP4 1.2 .3\r\n" +DLMGCP Failed to parse MGCP response header (audio ip) +got rc=-22 + +test_sdp_section_start() test [18]: +body: "some mgcp header data\r\nand header params\r\n\r\nc=IN IP4 \r\n" +DLMGCP Failed to parse MGCP response header (audio ip) +got rc=-22 DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2 DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2 diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 2b03ba1..039fbd9 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -109,6 +109,20 @@ X-Osmux: 2 Overfolow test: +IPv6 test: +MDCX 19 23 at mgw MGCP 1.0 +C: 2f +I: 11 +M: sendrecv + +v=0 +o=- 2f 23 IN IP6 ::1 +s=- +c=IN IP6 2001:db8:1::ab9:c0a8:102 +t=0 0 +m=audio 1234 RTP/AVP 3 +a=ptime:20 + test_mgcp_client_cancel(): @@ -149,6 +163,24 @@ test_sdp_section_start() test [8]: test_sdp_section_start() test [9]: + +test_sdp_section_start() test [10]: + +test_sdp_section_start() test [11]: + +test_sdp_section_start() test [12]: + +test_sdp_section_start() test [13]: + +test_sdp_section_start() test [14]: + +test_sdp_section_start() test [15]: + +test_sdp_section_start() test [16]: + +test_sdp_section_start() test [17]: + +test_sdp_section_start() test [18]: 110 => 96 111 => 97 112 => 98 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I936bf57d37f5f0607dfe7fc66c37e424c3793f9b Gerrit-Change-Number: 19888 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:31 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Allow setting IPv6 addresses In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19916 ) Change subject: mgcp_client: Allow setting IPv6 addresses ...................................................................... mgcp_client: Allow setting IPv6 addresses Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f --- M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.c 2 files changed, 7 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index df84226..72068b4 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -794,7 +794,7 @@ /* Initalize socket with the currently configured port * number */ - rc = osmo_sock_init2_ofd(&wq->bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, + rc = osmo_sock_init2_ofd(&wq->bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); if (rc > 0) diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index d4e78f1..70fea5a 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -36,9 +36,10 @@ struct mgcp_client_conf *global_mgcp_client_conf = NULL; DEFUN(cfg_mgw_local_ip, cfg_mgw_local_ip_cmd, - "mgw local-ip A.B.C.D", + "mgw local-ip " VTY_IPV46_CMD, MGW_STR "local bind to connect to MGW from\n" - "local bind IP address\n") + "local bind IPv4 address\n" + "local bind IPv6 address\n") { if (!global_mgcp_client_conf) return CMD_ERR_NOTHING_TODO; @@ -69,9 +70,10 @@ "local bind port\n") DEFUN(cfg_mgw_remote_ip, cfg_mgw_remote_ip_cmd, - "mgw remote-ip A.B.C.D", + "mgw remote-ip " VTY_IPV46_CMD, MGW_STR "remote IP address to reach the MGW at\n" - "remote IP address\n") + "remote IPv4 address\n" + "remote IPv6 address\n") { if (!global_mgcp_client_conf) return CMD_ERR_NOTHING_TODO; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f Gerrit-Change-Number: 19916 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:31 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19920 ) Change subject: mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible ...................................................................... mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible If "0.0.0.0", the default, is passed together with an IPv6 configured address (ex: "mgw remote-ip ::1") in VTY, socket creation will fail due to address version mismatch (because getaddrinfo() returns only an IPv4 address in the local result set). If instead NULL is passed, then 2 entries are returned, one in IPv4 and one in IPv6, and osmo_sock_init2 is smart enough to take one or another when passed AF_UNSPEC. Change-Id: I1be6f3b71486ce1782ba6b8c62f25145b42ec894 --- M include/osmocom/mgcp_client/mgcp_client.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 8914cc2..b5a3529 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -6,7 +6,7 @@ #include /* See also: RFC 3435, chapter 3.5 Transmission over UDP */ -#define MGCP_CLIENT_LOCAL_ADDR_DEFAULT "0.0.0.0" +#define MGCP_CLIENT_LOCAL_ADDR_DEFAULT NULL /* INADDR(6)_ANY */ #define MGCP_CLIENT_LOCAL_PORT_DEFAULT 2727 #define MGCP_CLIENT_REMOTE_ADDR_DEFAULT "127.0.0.1" #define MGCP_CLIENT_REMOTE_PORT_DEFAULT 2427 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1be6f3b71486ce1782ba6b8c62f25145b42ec894 Gerrit-Change-Number: 19920 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:32 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19945 ) Change subject: mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands ...................................................................... mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index e38a4ba..2505ff2 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -25,6 +25,7 @@ #include #include #include +#include /* Context information, this is attached to the priv pointer of the FSM and * is also handed back when dispatcheing events to the parent FSM. This is @@ -607,14 +608,16 @@ { struct mgcp_ctx *mgcp_ctx; struct osmo_fsm_inst *fi; - struct in_addr ip_test; + struct in6_addr ip_test; + OSMO_ASSERT(parent_fi); OSMO_ASSERT(mgcp); OSMO_ASSERT(conn_peer); /* Check if IP/Port information in conn info makes sense */ - if (conn_peer->port && inet_aton(conn_peer->addr, &ip_test) == 0) + if (conn_peer->port && inet_pton(osmo_ip_str_type(conn_peer->addr), + conn_peer->addr, &ip_test) != 1) return NULL; /* Allocate and configure a new fsm instance */ @@ -644,7 +647,7 @@ { OSMO_ASSERT(fi); struct mgcp_ctx *mgcp_ctx = fi->priv; - struct in_addr ip_test; + struct in6_addr ip_test; OSMO_ASSERT(mgcp_ctx); OSMO_ASSERT(conn_peer); @@ -668,8 +671,8 @@ LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, port == 0\n"); return -EINVAL; } - if (inet_aton(conn_peer->addr, &ip_test) == 0) { - LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, IP address == 0.0.0.0\n"); + if (inet_pton(osmo_ip_str_type(conn_peer->addr), conn_peer->addr, &ip_test) != 1) { + LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, IP address %s\n", conn_peer->addr); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732 Gerrit-Change-Number: 19945 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:32 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Deprecate unused IPv4-only API In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19946 ) Change subject: mgcp_client: Deprecate unused IPv4-only API ...................................................................... mgcp_client: Deprecate unused IPv4-only API The API and related implementation fields are not used internally nor externally, and only support IPv4. Let's simply deprecate the API and drop all the uneeded implementation. Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc --- M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_internal.h M src/libosmo-mgcp-client/mgcp_client.c 3 files changed, 4 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index b5a3529..02996a7 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -133,7 +133,7 @@ const char *mgcp_client_remote_addr_str(struct mgcp_client *mgcp); uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp); -uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp); +uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp) OSMO_DEPRECATED("deprecated, returns 0"); const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp); const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp); diff --git a/include/osmocom/mgcp_client/mgcp_client_internal.h b/include/osmocom/mgcp_client/mgcp_client_internal.h index 690a4af..b4b3b02 100644 --- a/include/osmocom/mgcp_client/mgcp_client_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_internal.h @@ -6,7 +6,6 @@ struct mgcp_client { struct mgcp_client_conf actual; - uint32_t remote_addr; struct osmo_wqueue wq; mgcp_trans_id_t next_trans_id; struct llist_head responses_pending; diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 72068b4..5972803 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -823,7 +823,6 @@ * \returns 0 on success, -EINVAL on error. */ int mgcp_client_connect(struct mgcp_client *mgcp) { - struct sockaddr_in addr; struct osmo_wqueue *wq; int rc; @@ -843,9 +842,6 @@ goto error_close_fd; } - inet_aton(mgcp->actual.remote_addr, &addr.sin_addr); - mgcp->remote_addr = htonl(addr.sin_addr.s_addr); - osmo_wqueue_init(wq, 1024); wq->bfd.when = OSMO_FD_READ; wq->bfd.data = mgcp; @@ -877,12 +873,13 @@ return mgcp->actual.remote_port; } -/*! Get the IP-Aaddress of the associated MGW as its numeric representation. +/*! Get the IP-Address of the associated MGW as its numeric representation. + * DEPRECATED, DON'T USE. * \param[in] mgcp MGCP client descriptor. * \returns IP-Address as 32 bit integer (network byte order) */ uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp) { - return mgcp->remote_addr; + return 0; } /* To compose endpoint names, usually for CRCX, use this as domain name. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc Gerrit-Change-Number: 19946 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:33 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: copy back Connection Information from MDCX ACK In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19953 ) Change subject: mgcp_client: copy back Connection Information from MDCX ACK ...................................................................... mgcp_client: copy back Connection Information from MDCX ACK This is needed in case MGW changes the local IP address (for instance because it initlaly offered an IPv4 address, and a client submitted a remote IPv6 address, so MGW needs then to offer a local IPv6 address for the RTP connection to be possible). Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c index c68d8b3..c1fc0de 100644 --- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c @@ -469,14 +469,12 @@ ci->pending = false; + rtp_info = data; + switch (ci->verb) { case MGCP_VERB_CRCX: /* If we sent a wildcarded endpoint name on CRCX, we need to store the resulting endpoint * name here. Also, we receive the MGW's RTP port information. */ - rtp_info = data; - OSMO_ASSERT(rtp_info); - ci->got_port_info = true; - ci->rtp_info = *rtp_info; osmo_strlcpy(ci->mgcp_ci_str, mgcp_conn_get_ci(ci->mgcp_client_fi), sizeof(ci->mgcp_ci_str)); if (rtp_info->endpoint[0]) { @@ -486,6 +484,15 @@ return; } ci->ep->first_crcx_complete = true; + OSMO_ASSERT(rtp_info); + /* fall through */ + case MGCP_VERB_MDCX: + /* Always update the received RTP ip/port information, since MGW + * may provide new one after remote end params changed */ + if (rtp_info) { + ci->got_port_info = true; + ci->rtp_info = *rtp_info; + } break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie964412b81fe6e10914790baaea724ca5f772adc Gerrit-Change-Number: 19953 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:34 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix mgcp_rtp_end field description comment In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19968 ) Change subject: mgw: Fix mgcp_rtp_end field description comment ...................................................................... mgw: Fix mgcp_rtp_end field description comment Change-Id: Ieb044daaaa47572cd9a2524ea69e903200527d17 --- M include/osmocom/mgcp/mgcp_network.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index c08d009..c4967eb 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -78,7 +78,7 @@ /* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */ struct mgcp_rtp_end { - /* local IP address of the RTP socket */ + /* remote IP address of the RTP socket */ struct in_addr addr; /* in network byte order */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ieb044daaaa47572cd9a2524ea69e903200527d17 Gerrit-Change-Number: 19968 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:36 +0000 Subject: Change in osmo-mgw[master]: mgw: Initial IPv6 support In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19969 ) Change subject: mgw: Initial IPv6 support ...................................................................... mgw: Initial IPv6 support This commit contains the bulky work of moving all address parsing to support IPv6 together with IPv4. Some specific patches required for full IPv6+IPv4 support requiring behavioral changes come after this one. Full Osmux IPv6 support is left out of the scope of this patch. Depends: libosmocore.git Ie07a38b05b7888885dba4ae795e9f3d9a561543d (> 1.4.0) Depends: libosmocore.git I59bf4b4b3ed14766a5a5285923d1ffa9fc8b2294 (> 1.4.0) Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c M tests/mgcp/mgcp_test.c 12 files changed, 281 insertions(+), 117 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 33bfe71..75e531b 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -23,6 +23,7 @@ #pragma once #include +#include #include #include #include @@ -207,4 +208,4 @@ int mgcp_create_bind(const char *source_addr, struct osmo_fd *fd, int port); -int mgcp_udp_send(int fd, struct in_addr *addr, int port, char *buf, int len); +int mgcp_udp_send(int fd, struct osmo_sockaddr *addr, int port, char *buf, int len); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 065494f..14cae25 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -26,7 +26,7 @@ #include #include -struct sockaddr_in; +struct sockaddr; struct mgcp_conn; struct mgcp_conn_rtp; struct mgcp_endpoint; @@ -42,7 +42,7 @@ struct osmo_rtp_msg_ctx { int proto; struct mgcp_conn_rtp *conn_src; - struct sockaddr_in *from_addr; + struct osmo_sockaddr *from_addr; }; #define OSMO_RTP_MSG_CTX(MSGB) ((struct osmo_rtp_msg_ctx*)(MSGB)->cb) diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index c4967eb..9674445 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -2,6 +2,9 @@ #include #include + +#include + #include #define MGCP_DUMMY_LOAD 0x23 @@ -79,7 +82,7 @@ /* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */ struct mgcp_rtp_end { /* remote IP address of the RTP socket */ - struct in_addr addr; + struct osmo_sockaddr addr; /* in network byte order */ int rtp_port, rtcp_port; @@ -121,12 +124,12 @@ /* is this tap active (1) or not (0) */ int enabled; /* IP/port to which we're forwarding the tapped data */ - struct sockaddr_in forward; + struct osmo_sockaddr forward; }; struct mgcp_conn; -int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, +int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct osmo_sockaddr *addr, struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst); int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn); @@ -140,7 +143,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, struct msgb *msg); + struct osmo_sockaddr *addr, struct msgb *msg); void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); int mgcp_set_ip_tos(int fd, int tos); diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index 69ba3d0..99b44d1 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -1,5 +1,6 @@ #pragma once +#include #include struct mgcp_conn_rtp; @@ -13,7 +14,7 @@ int osmux_init(int role, struct mgcp_config *cfg); int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, - struct in_addr *addr, uint16_t port); + struct osmo_sockaddr *addr, uint16_t port); void conn_osmux_disable(struct mgcp_conn_rtp *conn); int conn_osmux_allocate_cid(struct mgcp_conn_rtp *conn, int osmux_cid); void conn_osmux_release_cid(struct mgcp_conn_rtp *conn); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index d52fa64..328e580 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -349,6 +349,7 @@ char *mgcp_conn_dump(struct mgcp_conn *conn) { static char str[sizeof(conn->name)+sizeof(conn->id)+256]; + char ipbuf[INET6_ADDRSTRLEN]; if (!conn) { snprintf(str, sizeof(str), "(null connection)"); @@ -362,7 +363,7 @@ "rtp:%u rtcp:%u)", conn->name, conn->id, - inet_ntoa(conn->u.rtp.end.addr), + osmo_sockaddr_ntop(&conn->u.rtp.end.addr.u.sa, ipbuf), ntohs(conn->u.rtp.end.rtp_port), ntohs(conn->u.rtp.end.rtcp_port)); break; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 712c706..6ecb945 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -77,6 +77,16 @@ static int rx_rtp(struct msgb *msg); +static bool addr_is_any(struct osmo_sockaddr *osa) { + if (osa->u.sa.sa_family == AF_INET6) { + struct in6_addr ip6_any = IN6ADDR_ANY_INIT; + return memcmp(&osa->u.sin6.sin6_addr, + &ip6_any, sizeof(ip6_any)) == 0; + } else { + return osa->u.sin.sin_addr.s_addr == 0; + } +} + /*! Determine the local rtp bind IP-address. * \param[out] addr caller provided memory to store the resulting IP-Address. * \param[in] endp mgcp endpoint, that holds a copy of the VTY parameters. @@ -89,19 +99,20 @@ { struct mgcp_endpoint *endp; + char ipbuf[INET6_ADDRSTRLEN]; int rc; endp = conn->conn->endp; /* Try probing the local IP-Address */ - if (endp->cfg->net_ports.bind_addr_probe && conn->end.addr.s_addr != 0) { - rc = osmo_sock_local_ip(addr, inet_ntoa(conn->end.addr)); + if (endp->cfg->net_ports.bind_addr_probe && !addr_is_any(&conn->end.addr)) { + rc = osmo_sock_local_ip(addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); if (rc < 0) LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "local interface auto detection failed, using configured addresses...\n"); else { LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "selected local rtp bind ip %s by probing using remote ip %s\n", - addr, inet_ntoa(conn->end.addr)); + addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); return; } } @@ -110,7 +121,7 @@ if (endp->cfg->net_ports.bind_addr) { /* Check there is a bind IP for the RTP traffic configured, * if so, use that IP-Address */ - osmo_strlcpy(addr, endp->cfg->net_ports.bind_addr, INET_ADDRSTRLEN); + osmo_strlcpy(addr, endp->cfg->net_ports.bind_addr, INET6_ADDRSTRLEN); LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "using configured rtp bind ip as local bind ip %s\n", addr); @@ -118,7 +129,7 @@ /* No specific bind IP is configured for the RTP traffic, so * assume the IP where we listen for incoming MGCP messages * as bind IP */ - osmo_strlcpy(addr, endp->cfg->source_addr, INET_ADDRSTRLEN); + osmo_strlcpy(addr, endp->cfg->source_addr, INET6_ADDRSTRLEN); LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "using mgcp bind ip as local rtp bind ip: %s\n", addr); } @@ -154,19 +165,26 @@ * \param[in] buf buffer that holds the data to be send. * \param[in] len length of the data to be sent. * \returns bytes sent, -1 on error. */ -int mgcp_udp_send(int fd, struct in_addr *addr, int port, char *buf, int len) +int mgcp_udp_send(int fd, struct osmo_sockaddr *addr, int port, char *buf, int len) { - struct sockaddr_in out; + char ipbuf[INET6_ADDRSTRLEN]; + size_t addr_len; + bool is_ipv6 = addr->u.sa.sa_family == AF_INET6; LOGP(DRTP, LOGL_DEBUG, - "sending %i bytes length packet to %s:%u ...\n", - len, inet_ntoa(*addr), ntohs(port)); + "sending %i bytes length packet to %s:%u ...\n", len, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + ntohs(port)); - out.sin_family = AF_INET; - out.sin_port = port; - memcpy(&out.sin_addr, addr, sizeof(*addr)); + if (is_ipv6) { + addr->u.sin6.sin6_port = port; + addr_len = sizeof(addr->u.sin6); + } else { + addr->u.sin.sin_port = port; + addr_len = sizeof(addr->u.sin); + } - return sendto(fd, buf, len, 0, (struct sockaddr *)&out, sizeof(out)); + return sendto(fd, buf, len, 0, &addr->u.sa, addr_len); } /*! send RTP dummy packet (to keep NAT connection open). @@ -229,12 +247,13 @@ struct mgcp_rtp_state *state, struct mgcp_rtp_stream_state *sstate, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, + struct osmo_sockaddr *addr, uint16_t seq, uint32_t timestamp, const char *text, int32_t * tsdelta_out) { int32_t tsdelta; int32_t timestamp_error; + char ipbuf[INET6_ADDRSTRLEN]; /* Not fully intialized, skip */ if (sstate->last_tsdelta == 0 && timestamp == sstate->last_timestamp) @@ -251,8 +270,9 @@ "from %s:%d\n", text, seq, state->patch.timestamp_offset, state->patch.seq_offset, - sstate->ssrc, timestamp, inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + sstate->ssrc, timestamp, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } return 0; } @@ -267,9 +287,9 @@ "The %s timestamp delta is %d " "on SSRC: %u timestamp: %u " "from %s:%d\n", - text, tsdelta, - sstate->ssrc, timestamp, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + text, tsdelta, sstate->ssrc, timestamp, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); return 0; } @@ -281,7 +301,8 @@ "on SSRC: %u timestamp: %u from %s:%d\n", text, sstate->last_tsdelta, tsdelta, sstate->ssrc, timestamp, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } } @@ -303,7 +324,8 @@ (int16_t)(seq - sstate->last_seq), (int32_t)(timestamp - sstate->last_timestamp), tsdelta, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port), + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa), state->packet_duration); } return 1; @@ -313,12 +335,13 @@ static int adjust_rtp_timestamp_offset(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, + struct osmo_sockaddr *addr, int16_t delta_seq, uint32_t in_timestamp) { int32_t tsdelta = state->packet_duration; int timestamp_offset; uint32_t out_timestamp; + char ipbuf[INET6_ADDRSTRLEN]; if (tsdelta == 0) { tsdelta = state->out_stream.last_tsdelta; @@ -327,7 +350,8 @@ "A fixed packet duration is not available, " "using last output timestamp delta instead: %d " "from %s:%d\n", tsdelta, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } else { tsdelta = rtp_end->codec->rate * 20 / 1000; LOGPENDP(endp, DRTP, LOGL_NOTICE, @@ -335,7 +359,8 @@ "are not available, " "using fixed 20ms instead: %d " "from %s:%d\n", tsdelta, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } } @@ -344,13 +369,13 @@ if (state->patch.timestamp_offset != timestamp_offset) { state->patch.timestamp_offset = timestamp_offset; - LOGPENDP(endp, DRTP, LOGL_NOTICE, "Timestamp offset change on SSRC: %u " "SeqNo delta: %d, TS offset: %d, " "from %s:%d\n", state->in_stream.ssrc, delta_seq, state->patch.timestamp_offset, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } return timestamp_offset; @@ -360,9 +385,10 @@ static int align_rtp_timestamp_offset(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, + struct osmo_sockaddr *addr, uint32_t timestamp) { + char ipbuf[INET6_ADDRSTRLEN]; int ts_error = 0; int ts_check = 0; int ptime = state->packet_duration; @@ -375,14 +401,14 @@ /* If there is an alignment error, we have to compensate it */ if (ts_error) { state->patch.timestamp_offset += ptime - ts_error; - LOGPENDP(endp, DRTP, LOGL_NOTICE, "Corrected timestamp alignment error of %d on SSRC: %u " "new TS offset: %d, " "from %s:%d\n", ts_error, state->in_stream.ssrc, - state->patch.timestamp_offset, inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + state->patch.timestamp_offset, + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } /* Check we really managed to compensate the timestamp @@ -521,8 +547,9 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, struct msgb *msg) + struct osmo_sockaddr *addr, struct msgb *msg) { + char ipbuf[INET6_ADDRSTRLEN]; uint32_t arrival_time; int32_t transit; uint16_t seq; @@ -560,7 +587,8 @@ "pkt-duration: %d, from %s:%d\n", state->in_stream.ssrc, state->patch.seq_offset, state->packet_duration, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); if (state->packet_duration == 0) { state->packet_duration = rtp_end->codec->rate * 20 / 1000; @@ -568,14 +596,16 @@ "fixed packet duration is not available, " "using fixed 20ms instead: %d from %s:%d\n", state->packet_duration, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } } else if (state->in_stream.ssrc != ssrc) { LOGPENDP(endp, DRTP, LOGL_NOTICE, "SSRC changed: %u -> %u " "from %s:%d\n", state->in_stream.ssrc, rtp_hdr->ssrc, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); state->in_stream.ssrc = ssrc; if (rtp_end->force_constant_ssrc) { @@ -604,7 +634,8 @@ "SeqNo offset: %d, TS offset: %d " "from %s:%d\n", state->in_stream.ssrc, state->patch.seq_offset, state->patch.timestamp_offset, - inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); + osmo_sockaddr_ntop(&addr->u.sa, ipbuf), + osmo_sockaddr_port(&addr->u.sa)); } state->in_stream.last_tsdelta = 0; @@ -825,7 +856,7 @@ * \param[in] conn_src associated source connection. * \param[in] conn_dst associated destination connection. * \returns 0 on success, -1 on ERROR. */ -int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, +int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct osmo_sockaddr *addr, struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst) { @@ -836,6 +867,7 @@ struct mgcp_trunk *trunk = endp->trunk; struct mgcp_rtp_end *rtp_end; struct mgcp_rtp_state *rtp_state; + char ipbuf[INET6_ADDRSTRLEN]; char *dest_name; int rc; int len; @@ -886,7 +918,7 @@ "output disabled, drop to %s %s " "rtp_port:%u rtcp_port:%u\n", dest_name, - inet_ntoa(rtp_end->addr), + osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port) ); } else if (is_rtp) { @@ -932,7 +964,8 @@ LOGPENDP(endp, DRTP, LOGL_DEBUG, "process/send to %s %s " "rtp_port:%u rtcp_port:%u\n", - dest_name, inet_ntoa(rtp_end->addr), + dest_name, + osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port) ); @@ -975,7 +1008,7 @@ } else if (!trunk->omit_rtcp) { LOGPENDP(endp, DRTP, LOGL_DEBUG, "send to %s %s rtp_port:%u rtcp_port:%u\n", - dest_name, inet_ntoa(rtp_end->addr), + dest_name, osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port) ); @@ -995,10 +1028,11 @@ /* Check if the origin (addr) matches the address/port data of the RTP * connections. */ -static int check_rtp_origin(struct mgcp_conn_rtp *conn, - struct sockaddr_in *addr) +static int check_rtp_origin(struct mgcp_conn_rtp *conn, struct osmo_sockaddr *addr) { - if (conn->end.addr.s_addr == 0) { + char ipbuf[INET6_ADDRSTRLEN]; + + if (addr_is_any(&conn->end.addr)) { switch (conn->conn->mode) { case MGCP_CONN_LOOPBACK: /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP @@ -1010,7 +1044,8 @@ * MGCP port is in loopback mode, allow looping back the packet to any source. */ LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "In loopback mode and remote address not set:" - " allowing data from address: %s\n", inet_ntoa(addr->sin_addr)); + " allowing data from address: %s\n", + osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); return 0; default: @@ -1019,18 +1054,25 @@ * confuse humans with expected errors. */ LOGPCONN(conn->conn, DRTP, LOGL_INFO, "Rx RTP from %s, but remote address not set:" - " dropping early media\n", inet_ntoa(addr->sin_addr)); + " dropping early media\n", + osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); return -1; } } /* Note: Check if the inbound RTP data comes from the same host to * which we send our outgoing RTP traffic. */ - if (conn->end.addr.s_addr != addr->sin_addr.s_addr) { + if (conn->end.addr.u.sa.sa_family != addr->u.sa.sa_family || + (conn->end.addr.u.sa.sa_family == AF_INET && + conn->end.addr.u.sin.sin_addr.s_addr != addr->u.sin.sin_addr.s_addr) || + (conn->end.addr.u.sa.sa_family == AF_INET6 && + memcmp(&conn->end.addr.u.sin6.sin6_addr, &addr->u.sin6.sin6_addr, + sizeof(struct in6_addr)))) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "data from wrong address: %s, ", inet_ntoa(addr->sin_addr)); + "data from wrong address: %s, ", + osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); LOGPC(DRTP, LOGL_ERROR, "expected: %s\n", - inet_ntoa(conn->end.addr)); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "packet tossed\n"); return -1; } @@ -1039,10 +1081,11 @@ * the same as the remote port where we transmit outgoing RTP traffic * to (set by MDCX). We use this to check the origin of the data for * plausibility. */ - if (conn->end.rtp_port != addr->sin_port && - conn->end.rtcp_port != addr->sin_port) { + if (ntohs(conn->end.rtp_port) != osmo_sockaddr_port(&addr->u.sa) && + ntohs(conn->end.rtcp_port) != osmo_sockaddr_port(&addr->u.sa)) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "data from wrong source port: %d, ", ntohs(addr->sin_port)); + "data from wrong source port: %d, ", + osmo_sockaddr_port(&addr->u.sa)); LOGPC(DRTP, LOGL_ERROR, "expected: %d for RTP or %d for RTCP\n", ntohs(conn->end.rtp_port), ntohs(conn->end.rtcp_port)); @@ -1057,26 +1100,29 @@ * makes sense */ static int check_rtp_destin(struct mgcp_conn_rtp *conn) { + char ipbuf[INET6_ADDRSTRLEN]; + bool ip_is_any = addr_is_any(&conn->end.addr); + /* Note: it is legal to create a connection but never setting a port * and IP-address for outgoing data. */ - if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0 && conn->end.rtp_port == 0) { + if (ip_is_any && conn->end.rtp_port == 0) { LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "destination IP-address and rtp port is (not yet) known (%s:%u)\n", - inet_ntoa(conn->end.addr), conn->end.rtp_port); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), conn->end.rtp_port); return -1; } - if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0) { + if (ip_is_any) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "destination IP-address is invalid (%s:%u)\n", - inet_ntoa(conn->end.addr), conn->end.rtp_port); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), conn->end.rtp_port); return -1; } if (conn->end.rtp_port == 0) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "destination rtp port is invalid (%s:%u)\n", - inet_ntoa(conn->end.addr), conn->end.rtp_port); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), conn->end.rtp_port); return -1; } @@ -1147,7 +1193,6 @@ struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); enum rtp_proto proto = mc->proto; struct mgcp_conn_rtp *conn_src = mc->conn_src; - struct sockaddr_in *from_addr = mc->from_addr; struct mgcp_endpoint *endp = conn_src->conn->endp; LOGPENDP(endp, DRTP, LOGL_DEBUG, "destin conn:%s\n", @@ -1167,7 +1212,7 @@ "endpoint type is MGCP_RTP_DEFAULT, " "using mgcp_send() to forward data directly\n"); return mgcp_send(endp, proto == MGCP_PROTO_RTP, - from_addr, msg, conn_src, conn_dst); + mc->from_addr, msg, conn_src, conn_dst); case MGCP_OSMUX_BSC_NAT: case MGCP_OSMUX_BSC: LOGPENDP(endp, DRTP, LOGL_DEBUG, @@ -1197,7 +1242,7 @@ struct mgcp_conn_rtp *conn_src = mc->conn_src; struct mgcp_conn *conn = conn_src->conn; struct mgcp_conn *conn_dst; - struct sockaddr_in *from_addr = mc->from_addr; + struct osmo_sockaddr *from_addr = mc->from_addr; /*! NOTE: This callback function implements the endpoint specific * dispatch behaviour of an rtp bridge/proxy endpoint. It is assumed @@ -1216,8 +1261,19 @@ * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ if (conn->u.rtp.end.rtp_port == 0) { - conn->u.rtp.end.addr = from_addr->sin_addr; - conn->u.rtp.end.rtp_port = from_addr->sin_port; + OSMO_ASSERT(conn->u.rtp.end.addr.u.sa.sa_family == from_addr->u.sa.sa_family); + switch (from_addr->u.sa.sa_family) { + case AF_INET: + conn->u.rtp.end.addr.u.sin.sin_addr = from_addr->u.sin.sin_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin.sin_port; + break; + case AF_INET6: + conn->u.rtp.end.addr.u.sin6.sin6_addr = from_addr->u.sin6.sin6_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin6.sin6_port; + break; + default: + OSMO_ASSERT(false); + } } return mgcp_send_rtp(conn_src, msg); } @@ -1266,7 +1322,7 @@ struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); struct mgcp_conn_rtp *conn_src = mc->conn_src; struct mgcp_conn *conn = conn_src->conn; - struct sockaddr_in *from_addr = mc->from_addr; + struct osmo_sockaddr *from_addr = mc->from_addr; /* Check if the connection is in loopback mode, if yes, just send the * incoming data back to the origin */ @@ -1276,8 +1332,19 @@ * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ if (conn->u.rtp.end.rtp_port == 0) { - conn->u.rtp.end.addr = from_addr->sin_addr; - conn->u.rtp.end.rtp_port = from_addr->sin_port; + OSMO_ASSERT(conn->u.rtp.end.addr.u.sa.sa_family == from_addr->u.sa.sa_family); + switch (from_addr->u.sa.sa_family) { + case AF_INET: + conn->u.rtp.end.addr.u.sin.sin_addr = from_addr->u.sin.sin_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin.sin_port; + break; + case AF_INET6: + conn->u.rtp.end.addr.u.sin6.sin6_addr = from_addr->u.sin6.sin6_addr; + conn->u.rtp.end.rtp_port = from_addr->u.sin6.sin6_port; + break; + default: + OSMO_ASSERT(false); + } } return mgcp_send_rtp(conn_src, msg); } @@ -1331,8 +1398,9 @@ struct mgcp_conn_rtp *conn_src; struct mgcp_endpoint *endp; - struct sockaddr_in addr; + struct osmo_sockaddr addr; socklen_t slen = sizeof(addr); + char ipbuf[INET6_ADDRSTRLEN]; int ret; enum rtp_proto proto; struct osmo_rtp_msg_ctx *mc; @@ -1346,7 +1414,7 @@ proto = (fd == &conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; - ret = recvfrom(fd->fd, msgb_data(msg), msg->data_len, 0, (struct sockaddr *)&addr, &slen); + ret = recvfrom(fd->fd, msgb_data(msg), msg->data_len, 0, (struct sockaddr *)&addr.u.sa, &slen); if (ret <= 0) { LOG_CONN_RTP(conn_src, LOGL_ERROR, "recvfrom error: %s\n", strerror(errno)); @@ -1358,7 +1426,8 @@ LOG_CONN_RTP(conn_src, LOGL_DEBUG, "%s: rx %u bytes from %s:%u\n", proto == MGCP_PROTO_RTP ? "RTP" : "RTPC", - msgb_length(msg), inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); + msgb_length(msg), osmo_sockaddr_ntop(&addr.u.sa, ipbuf), + osmo_sockaddr_port(&addr.u.sa)); if ((proto == MGCP_PROTO_RTP && check_rtp(conn_src, msg)) || (proto == MGCP_PROTO_RTCP && check_rtcp(conn_src, msg))) { @@ -1383,7 +1452,10 @@ }; LOG_CONN_RTP(conn_src, LOGL_DEBUG, "msg ctx: %d %p %s\n", mc->proto, mc->conn_src, - osmo_hexdump((void*)mc->from_addr, sizeof(struct sockaddr_in))); + osmo_hexdump((void*)mc->from_addr, + mc->from_addr->u.sa.sa_family == AF_INET6 ? + sizeof(struct sockaddr_in6) : + sizeof(struct sockaddr_in))); /* Increment RX statistics */ rate_ctr_inc(&conn_src->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]); @@ -1404,7 +1476,7 @@ { struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); struct mgcp_conn_rtp *conn_src = mc->conn_src; - struct sockaddr_in *from_addr = mc->from_addr; + struct osmo_sockaddr *from_addr = mc->from_addr; struct mgcp_conn *conn = conn_src->conn; struct mgcp_trunk *trunk = conn->endp->trunk; @@ -1456,7 +1528,7 @@ { int rc; - rc = osmo_sock_init2(AF_INET, SOCK_DGRAM, IPPROTO_UDP, source_addr, port, + rc = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, source_addr, port, NULL, 0, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DRTP, LOGL_ERROR, "failed to bind UDP port (%s:%i).\n", @@ -1536,7 +1608,7 @@ { char name[512]; struct mgcp_rtp_end *end; - char local_ip_addr[INET_ADDRSTRLEN]; + char local_ip_addr[INET6_ADDRSTRLEN]; snprintf(name, sizeof(name), "%s-%s", conn->conn->name, conn->conn->id); end = &conn->end; diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 93c922d..5864c95 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -148,15 +148,20 @@ /* Lookup existing handle for a specified address, if the handle can not be * found, the function will automatically allocate one */ static struct osmux_in_handle * -osmux_handle_lookup(struct mgcp_config *cfg, struct in_addr *addr, int rem_port) +osmux_handle_lookup(struct mgcp_config *cfg, struct osmo_sockaddr *addr, int rem_port) { struct osmux_handle *h; - h = osmux_handle_find_get(addr, rem_port); + if (addr->u.sa.sa_family != AF_INET) { + LOGP(DLMGCP, LOGL_DEBUG, "IPv6 not supported in osmux yet!\n"); + return NULL; + } + + h = osmux_handle_find_get(&addr->u.sin.sin_addr, rem_port); if (h != NULL) return h->in; - h = osmux_handle_alloc(cfg, addr, rem_port); + h = osmux_handle_alloc(cfg, &addr->u.sin.sin_addr, rem_port); if (h == NULL) return NULL; @@ -236,7 +241,7 @@ { struct mgcp_conn_rtp *conn = data; struct mgcp_endpoint *endp = conn->conn->endp; - struct sockaddr_in addr = { /* FIXME: do we know the source address?? */ }; + struct osmo_sockaddr addr = { /* FIXME: do we know the source address?? */ }; struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); *mc = (struct osmo_rtp_msg_ctx){ .proto = MGCP_PROTO_RTP, @@ -275,6 +280,8 @@ static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, bool sending) { + char ipbuf[INET6_ADDRSTRLEN]; + switch(conn->osmux.state) { case OSMUX_STATE_ACTIVATING: if (osmux_enable_conn(endp, conn, &conn->end.addr, conn->end.rtp_port) < 0) { @@ -287,7 +294,8 @@ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, "Osmux %s CID %u towards %s:%u is now enabled\n", sending ? "sent" : "received", - conn->osmux.cid, inet_ntoa(conn->end.addr), + conn->osmux.cid, + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), ntohs(conn->end.rtp_port)); return 0; case OSMUX_STATE_ENABLED: @@ -433,7 +441,7 @@ * \param[in] port portnumber of the remote OSMUX endpoint (in network byte order) * \returns 0 on success, -1 on ERROR */ int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, - struct in_addr *addr, uint16_t port) + struct osmo_sockaddr *addr, uint16_t port) { /*! If osmux is enabled, initialize the output handler. This handler is * used to reconstruct the RTP flow from osmux. The RTP SSRC is @@ -444,7 +452,7 @@ * overlapping RTP SSRC traveling to the BTSes behind the BSC, * similarly, for flows traveling to the MSC. */ - struct in_addr addr_unset = {}; + struct in6_addr addr_unset = {}; static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); uint16_t osmux_dummy = endp->cfg->osmux_dummy; @@ -457,7 +465,10 @@ } /* Wait until we have the connection information from MDCX */ - if (memcmp(&conn->end.addr, &addr_unset, sizeof(addr_unset)) == 0) { + if (memcmp(&conn->end.addr, &addr_unset, + conn->end.addr.u.sa.sa_family == AF_INET6 ? + sizeof(struct in6_addr) : + sizeof(struct in_addr)) == 0) { LOGPCONN(conn->conn, DLMGCP, LOGL_INFO, "Osmux remote address/port still unknown\n"); return -1; @@ -559,6 +570,7 @@ * \returns bytes sent, -1 on error */ int osmux_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn) { + char ipbuf[INET6_ADDRSTRLEN]; struct osmux_hdr *osmuxh; int buf_len; struct in_addr addr_unset = {}; @@ -588,7 +600,8 @@ LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s:%u CID %u\n", - inet_ntoa(conn->end.addr), ntohs(conn->end.rtp_port), conn->osmux.cid); + osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), + ntohs(conn->end.rtp_port), conn->osmux.cid); return mgcp_udp_send(osmux_fd.fd, &conn->end.addr, conn->end.rtp_port, (char*)osmuxh, buf_len); diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 9ec4aee..1269524 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -230,7 +230,7 @@ struct msgb *sdp; int rc; struct msgb *result; - char local_ip_addr[INET_ADDRSTRLEN]; + char local_ip_addr[INET6_ADDRSTRLEN]; sdp = msgb_alloc_headroom(4096, 128, "sdp record"); if (!sdp) diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 1c3c89a..e98ca94 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -21,6 +21,9 @@ */ #include +#include +#include + #include #include #include @@ -259,6 +262,42 @@ return -EINVAL; } + +static int audio_ip_from_sdp(struct osmo_sockaddr *dst_addr, char *sdp) +{ + bool is_ipv6; + char ipbuf[INET6_ADDRSTRLEN]; + if (strncmp("c=IN IP", sdp, 7) != 0) + return -1; + sdp += 7; + if (*sdp == '6') + is_ipv6 = true; + else if (*sdp == '4') + is_ipv6 = false; + else + return -1; + sdp++; + if (*sdp != ' ') + return -1; + sdp++; + if (is_ipv6) { + /* 45 = INET6_ADDRSTRLEN -1 */ + if (sscanf(sdp, "%45s", ipbuf) != 1) + return -1; + if (inet_pton(AF_INET6, ipbuf, &dst_addr->u.sin6.sin6_addr) != 1) + return -1; + dst_addr->u.sa.sa_family = AF_INET6; + } else { + /* 15 = INET_ADDRSTRLEN -1 */ + if (sscanf(sdp, "%15s", ipbuf) != 1) + return -1; + if (inet_pton(AF_INET, ipbuf, &dst_addr->u.sin.sin_addr) != 1) + return -1; + dst_addr->u.sa.sa_family = AF_INET; + } + return 0; +} + /* Pick optional fmtp parameters by payload type, if there are no fmtp * parameters, a nullpointer is returned */ static struct mgcp_codec_param *param_by_pt(int pt, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len) @@ -289,6 +328,7 @@ struct sdp_fmtp_param fmtp_params[MGCP_MAX_CODECS]; unsigned int fmtp_used = 0; struct mgcp_codec_param *codec_param; + char ipbuf[INET6_ADDRSTRLEN]; char *line; unsigned int i; void *tmp_ctx = talloc_new(NULL); @@ -298,7 +338,6 @@ int ptime, ptime2 = 0; char audio_name[64]; int port, rc; - char ipv4[16]; OSMO_ASSERT(endp); OSMO_ASSERT(conn); @@ -355,10 +394,8 @@ codecs_used = rc; break; case 'c': - - if (sscanf(line, "c=IN IP4 %15s", ipv4) == 1) { - inet_aton(ipv4, &rtp->addr); - } + if (audio_ip_from_sdp(&rtp->addr, line) < 0) + return -1; break; default: if (p->endp) @@ -393,7 +430,7 @@ LOGPCONN(conn->conn, DLMGCP, LOGL_NOTICE, "Got media info via SDP: port:%d, addr:%s, duration:%d, payload-types:", - ntohs(rtp->rtp_port), inet_ntoa(rtp->addr), + ntohs(rtp->rtp_port), osmo_sockaddr_ntop(&rtp->addr.u.sa, ipbuf), rtp->packet_duration_ms); if (codecs_used == 0) LOGPC(DLMGCP, LOGL_NOTICE, "none"); @@ -529,6 +566,7 @@ int local_port; struct sdp_fmtp_param fmtp_params[1]; unsigned int fmtp_params_len = 0; + bool addr_is_v6; OSMO_ASSERT(endp); OSMO_ASSERT(conn); @@ -543,12 +581,16 @@ audio_name = codec->audio_name; payload_type = codec->payload_type; + addr_is_v6 = osmo_ip_str_type(addr) == AF_INET6; + rc = msgb_printf(sdp, "v=0\r\n" - "o=- %s 23 IN IP4 %s\r\n" + "o=- %s 23 IN IP%c %s\r\n" "s=-\r\n" - "c=IN IP4 %s\r\n" - "t=0 0\r\n", conn->conn->id, addr, addr); + "c=IN IP%c %s\r\n" + "t=0 0\r\n", conn->conn->id, + addr_is_v6 ? '6' : '4', addr, + addr_is_v6 ? '6' : '4', addr); if (rc < 0) goto buffer_too_small; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 22863c7..8ea1cdd 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -22,6 +22,7 @@ */ #include +#include #include #include #include @@ -407,9 +408,11 @@ DEFUN(cfg_mgcp_local_ip, cfg_mgcp_local_ip_cmd, - "local ip A.B.C.D", + "local ip " VTY_IPV46_CMD, "Local options for the SDP record\n" - IP_STR "IPv4 Address to use in SDP record\n") + IP_STR + "IPv4 Address to use in SDP record\n" + "IPv6 Address to use in SDP record\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->local_ip, argv[0]); return CMD_SUCCESS; @@ -418,7 +421,10 @@ #define BIND_STR "Listen/Bind related socket option\n" DEFUN(cfg_mgcp_bind_ip, cfg_mgcp_bind_ip_cmd, - "bind ip A.B.C.D", BIND_STR IP_STR "IPv4 Address to bind to\n") + "bind ip " VTY_IPV46_CMD, + BIND_STR IP_STR + "IPv4 Address to bind to\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->source_addr, argv[0]); return CMD_SUCCESS; @@ -494,8 +500,10 @@ DEFUN(cfg_mgcp_rtp_bind_ip, cfg_mgcp_rtp_bind_ip_cmd, - "rtp bind-ip A.B.C.D", - RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") + "rtp bind-ip " VTY_IPV46_CMD, + RTP_STR "Bind endpoints facing the Network\n" + "IPv4 Address to bind to\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr, argv[0]); return CMD_SUCCESS; @@ -850,11 +858,13 @@ return CMD_SUCCESS; } -#define CALL_AGENT_STR "Callagent information\n" +#define CALL_AGENT_STR "Call agent information\n" DEFUN(cfg_mgcp_agent_addr, cfg_mgcp_agent_addr_cmd, - "call-agent ip A.B.C.D", - CALL_AGENT_STR IP_STR "IPv4 Address of the callagent\n") + "call-agent ip " VTY_IPV46_CMD, + CALL_AGENT_STR IP_STR + "IPv4 Address of the call agent\n" + "IPv6 Address of the call agent\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->call_agent_addr, argv[0]); return CMD_SUCCESS; @@ -1236,13 +1246,15 @@ DEFUN(tap_rtp, tap_rtp_cmd, - "tap-rtp <0-64> ENDPOINT CONN (in|out) A.B.C.D <0-65534>", + "tap-rtp <0-64> ENDPOINT CONN (in|out) " VTY_IPV46_CMD " <0-65534>", "Forward data on endpoint to a different system\n" "Trunk number\n" "The endpoint in hex\n" "The connection id in hex\n" "Forward incoming data\n" "Forward leaving data\n" - "destination IP of the data\n" "destination port\n") + "Destination IPv4 of the data\n" + "Destination IPv6 of the data\n" + "Destination port\n") { struct mgcp_rtp_tap *tap; struct mgcp_trunk *trunk; @@ -1290,8 +1302,22 @@ } memset(&tap->forward, 0, sizeof(tap->forward)); - inet_aton(argv[4], &tap->forward.sin_addr); - tap->forward.sin_port = htons(atoi(argv[5])); + + tap->forward.u.sa.sa_family = osmo_ip_str_type(argv[4]); + switch (tap->forward.u.sa.sa_family) { + case AF_INET: + if (inet_pton(AF_INET, argv[4], &tap->forward.u.sin.sin_addr) != 1) + return CMD_WARNING; + tap->forward.u.sin.sin_port = htons(atoi(argv[5])); + break; + case AF_INET6: + if (inet_pton(AF_INET6, argv[4], &tap->forward.u.sin6.sin6_addr) != 1) + return CMD_WARNING; + tap->forward.u.sin6.sin6_port = htons(atoi(argv[5])); + break; + default: + return CMD_WARNING; + } tap->enabled = 1; return CMD_SUCCESS; } @@ -1407,7 +1433,10 @@ DEFUN(cfg_mgcp_osmux_ip, cfg_mgcp_osmux_ip_cmd, - "osmux bind-ip A.B.C.D", OSMUX_STR IP_STR "IPv4 Address to bind to\n") + "osmux bind-ip " VTY_IPV46_CMD, + OSMUX_STR IP_STR + "IPv4 Address to bind to\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr, argv[0]); return CMD_SUCCESS; diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 7f4df2e..37357a0 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -179,7 +179,7 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what) { - struct sockaddr_in addr; + struct osmo_sockaddr addr; socklen_t slen = sizeof(addr); struct msgb *msg; struct msgb *resp; @@ -205,7 +205,7 @@ msgb_reset(msg); if (resp) { - sendto(cfg->gw_fd.bfd.fd, resp->l2h, msgb_l2len(resp), 0, (struct sockaddr *) &addr, sizeof(addr)); + sendto(cfg->gw_fd.bfd.fd, resp->l2h, msgb_l2len(resp), 0, &addr.u.sa, sizeof(addr)); msgb_free(resp); } @@ -345,7 +345,7 @@ if (cfg->call_agent_addr) flags |= OSMO_SOCK_F_CONNECT; - rc = osmo_sock_init2_ofd(&cfg->gw_fd.bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, + rc = osmo_sock_init2_ofd(&cfg->gw_fd.bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, cfg->source_addr, cfg->source_port, cfg->call_agent_addr, cfg->call_agent_addr ? 2727 : 0, flags); if (rc < 0) { diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index c5b6d17..620b0d1 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -1262,7 +1263,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, struct msgb *msg); + struct osmo_sockaddr *addr, struct msgb *msg); static void test_packet_error_detection(int patch_ssrc, int patch_ts) { @@ -1274,7 +1275,7 @@ struct mgcp_config cfg = {0}; struct mgcp_rtp_state state; struct mgcp_rtp_end *rtp; - struct sockaddr_in addr = { 0 }; + struct osmo_sockaddr addr = { 0 }; uint32_t last_ssrc = 0; uint32_t last_timestamp = 0; uint32_t last_seqno = 0; @@ -1486,7 +1487,8 @@ OSMO_ASSERT(conn->end.rtp_port == htons(16434)); memset(&addr, 0, sizeof(addr)); inet_aton("8.8.8.8", &addr); - OSMO_ASSERT(conn->end.addr.s_addr == addr.s_addr); + OSMO_ASSERT(conn->end.addr.u.sa.sa_family == AF_INET); + OSMO_ASSERT(conn->end.addr.u.sin.sin_addr.s_addr == addr.s_addr); /* Check what happens without that flag */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I504ca776d88fd852bbaef07060c125980db3fdd7 Gerrit-Change-Number: 19969 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:37 +0000 Subject: Change in osmo-mgw[master]: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19970 ) Change subject: mgw: Introduce VTY cmd 'rtp bind-ip-v6' command ...................................................................... mgw: Introduce VTY cmd 'rtp bind-ip-v6' command This commit allows for fully IPv6 systems to work fine. However, if a remote endpoint still wants to use IPv4, it will fail since at this point osmo-mgw still doesn't re-bind the local end of the connection to an IPv4 after having initially bound it to an IPv6 one. This kind of scenarios get fixed in next commits. TODO: really bind the socket if a different IP address is requested. Change-Id: I8ed94bd3f674f498e6ba315f44a351fff9c1be15 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 53 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 75e531b..f3f225e 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -95,7 +95,8 @@ */ struct mgcp_port_range { /* addr or NULL to fall-back to default */ - char *bind_addr; + char *bind_addr_v4; + char *bind_addr_v6; /* dynamically allocated */ int range_start; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6ecb945..84f3604 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -102,9 +102,11 @@ char ipbuf[INET6_ADDRSTRLEN]; int rc; endp = conn->conn->endp; + bool rem_addr_set = !addr_is_any(&conn->end.addr); + char *bind_addr; /* Try probing the local IP-Address */ - if (endp->cfg->net_ports.bind_addr_probe && !addr_is_any(&conn->end.addr)) { + if (endp->cfg->net_ports.bind_addr_probe && rem_addr_set) { rc = osmo_sock_local_ip(addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); if (rc < 0) LOGPCONN(conn->conn, DRTP, LOGL_ERROR, @@ -118,21 +120,31 @@ } /* Select from preconfigured IP-Addresses. We don't have bind_addr for Osmux (yet?). */ - if (endp->cfg->net_ports.bind_addr) { + if (rem_addr_set) { /* Check there is a bind IP for the RTP traffic configured, * if so, use that IP-Address */ - osmo_strlcpy(addr, endp->cfg->net_ports.bind_addr, INET6_ADDRSTRLEN); + bind_addr = conn->end.addr.u.sa.sa_family == AF_INET6 ? + endp->cfg->net_ports.bind_addr_v6 : + endp->cfg->net_ports.bind_addr_v4; + } else { + /* Choose any of the bind addresses, preferring v6 over v4 */ + bind_addr = endp->cfg->net_ports.bind_addr_v6; + if (!bind_addr) + bind_addr = endp->cfg->net_ports.bind_addr_v4; + } + if (bind_addr) { LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "using configured rtp bind ip as local bind ip %s\n", - addr); + bind_addr); } else { /* No specific bind IP is configured for the RTP traffic, so * assume the IP where we listen for incoming MGCP messages * as bind IP */ - osmo_strlcpy(addr, endp->cfg->source_addr, INET6_ADDRSTRLEN); + bind_addr = endp->cfg->source_addr; LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, - "using mgcp bind ip as local rtp bind ip: %s\n", addr); + "using mgcp bind ip as local rtp bind ip: %s\n", bind_addr); } + osmo_strlcpy(addr, bind_addr, INET6_ADDRSTRLEN); } /* This does not need to be a precision timestamp and diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 8ea1cdd..aa27d41 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -71,9 +71,12 @@ vty_out(vty, " rtp port-range %u %u%s", g_cfg->net_ports.range_start, g_cfg->net_ports.range_end, VTY_NEWLINE); - if (g_cfg->net_ports.bind_addr) + if (g_cfg->net_ports.bind_addr_v4) vty_out(vty, " rtp bind-ip %s%s", - g_cfg->net_ports.bind_addr, VTY_NEWLINE); + g_cfg->net_ports.bind_addr_v4, VTY_NEWLINE); + if (g_cfg->net_ports.bind_addr_v6) + vty_out(vty, " rtp bind-ip-v6 %s%s", + g_cfg->net_ports.bind_addr_v6, VTY_NEWLINE); if (g_cfg->net_ports.bind_addr_probe) vty_out(vty, " rtp ip-probing%s", VTY_NEWLINE); else @@ -500,12 +503,11 @@ DEFUN(cfg_mgcp_rtp_bind_ip, cfg_mgcp_rtp_bind_ip_cmd, - "rtp bind-ip " VTY_IPV46_CMD, + "rtp bind-ip A.B.C.D", RTP_STR "Bind endpoints facing the Network\n" - "IPv4 Address to bind to\n" - "IPv6 Address to bind to\n") + "IPv4 Address to bind to\n") { - osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr, argv[0]); + osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v4, argv[0]); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgcp_rtp_bind_ip, @@ -519,8 +521,8 @@ NO_STR RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") { - talloc_free(g_cfg->net_ports.bind_addr); - g_cfg->net_ports.bind_addr = NULL; + talloc_free(g_cfg->net_ports.bind_addr_v4); + g_cfg->net_ports.bind_addr_v4 = NULL; return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgcp_rtp_no_bind_ip, @@ -529,6 +531,27 @@ NO_STR RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") +DEFUN(cfg_mgcp_rtp_bind_ip_v6, + cfg_mgcp_rtp_bind_ip_v6_cmd, + "rtp bind-ip-v6 " VTY_IPV6_CMD, + RTP_STR "Bind endpoints facing the Network\n" + "IPv6 Address to bind to\n") +{ + osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v6, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_rtp_no_bind_ip_v6, +cfg_mgcp_rtp_no_bind_ip_v6_cmd, +"no rtp bind-ip-v6", +NO_STR RTP_STR "Bind endpoints facing the Network\n" +"Address to bind to\n") +{ + talloc_free(g_cfg->net_ports.bind_addr_v6); + g_cfg->net_ports.bind_addr_v6 = NULL; + return CMD_SUCCESS; +} + DEFUN(cfg_mgcp_rtp_net_bind_ip_probing, cfg_mgcp_rtp_net_bind_ip_probing_cmd, "rtp ip-probing", @@ -1527,8 +1550,10 @@ install_element(MGCP_NODE, &cfg_mgcp_rtp_port_range_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_net_bind_ip_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_bind_ip_cmd); + install_element(MGCP_NODE, &cfg_mgcp_rtp_bind_ip_v6_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_no_net_bind_ip_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_no_bind_ip_cmd); + install_element(MGCP_NODE, &cfg_mgcp_rtp_no_bind_ip_v6_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_net_bind_ip_probing_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_no_net_bind_ip_probing_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_ip_dscp_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8ed94bd3f674f498e6ba315f44a351fff9c1be15 Gerrit-Change-Number: 19970 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:38 +0000 Subject: Change in osmo-mgw[master]: mgw: Find and store RTP conn local_addr once during CRCX handling In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19971 ) Change subject: mgw: Find and store RTP conn local_addr once during CRCX handling ...................................................................... mgw: Find and store RTP conn local_addr once during CRCX handling It doesn't make sense to call the function several times since anyway we are only binding during allocate_port()->mgcp_bind_net_rtp_port()->bind_rtp()->mgcp_create_bind()->osmo_sock_init2(). Let's better calculate the local IP addr once and use that stored value. THis is a previous step towards next commit updating the local IP addr and re-bindng if encessary. Change-Id: I803b99c5e5fe0f92a5bf6796d8c25df88d1608e6 --- M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 15 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index 9674445..7dbf330 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -118,6 +118,9 @@ /* local UDP port number of the RTP socket; RTCP is +1 */ int local_port; + /* where the endpoint RTP connection binds to, set during CRCX and + * possibly updated during MDCX */ + char local_addr[INET6_ADDRSTRLEN]; }; struct mgcp_rtp_tap { diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 84f3604..75a4754 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1620,7 +1620,6 @@ { char name[512]; struct mgcp_rtp_end *end; - char local_ip_addr[INET6_ADDRSTRLEN]; snprintf(name, sizeof(name), "%s-%s", conn->conn->name, conn->conn->id); end = &conn->end; @@ -1643,9 +1642,7 @@ end->rtcp.data = conn; end->rtcp.cb = rtp_data_net; - mgcp_get_local_addr(local_ip_addr, conn); - - return bind_rtp(endp->cfg, local_ip_addr, end, endp); + return bind_rtp(endp->cfg, conn->end.local_addr, end, endp); } /*! free allocated RTP and RTCP ports. diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 1269524..1e7ccbf 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -223,24 +223,22 @@ const char *trans_id, bool add_conn_params) { - /* TODO: we may want to define another local_ip_osmux var to us for - OSMUX connections. Perhaps adding a new internal API to get it based - on conn type */ - const char *addr = endp->cfg->local_ip; + /* cfg->local_ip allows overwritting the announced IP address with + * regards to the one we actually bind to. Useful in behind-NAT + * scenarios. + * TODO: we may want to define another local_ip_osmux var to + * us for OSMUX connections. Perhaps adding a new internal API to get it + * based on conn type. + */ + const char *addr = endp->cfg->local_ip ? : conn->end.local_addr; struct msgb *sdp; int rc; struct msgb *result; - char local_ip_addr[INET6_ADDRSTRLEN]; sdp = msgb_alloc_headroom(4096, 128, "sdp record"); if (!sdp) return NULL; - if (!addr) { - mgcp_get_local_addr(local_ip_addr, conn); - addr = local_ip_addr; - } - /* Attach optional connection parameters */ if (add_conn_params) { rc = add_params(sdp, endp, conn); @@ -943,6 +941,9 @@ goto error2; } + /* Find a local address for conn based on policy and initial SDP remote + information, then find a free port for it */ + mgcp_get_local_addr(conn->end.local_addr, conn); 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/c/osmo-mgw/+/19971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I803b99c5e5fe0f92a5bf6796d8c25df88d1608e6 Gerrit-Change-Number: 19971 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:55:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:55:39 +0000 Subject: Change in osmo-mgw[master]: mgw: Announce and rebind new local address if change required during ... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19972 ) Change subject: mgw: Announce and rebind new local address if change required during MDCX ...................................................................... mgw: Announce and rebind new local address if change required during MDCX MDCX may provide a new remote address, which means we may need to update our announced IP addr and re-bind our local end. This can happen for instance if MGW initially provided an IPv4 during CRCX ACK, and now MDCX tells us the remote has an IPv6 address. Change-Id: Iaed424e2c209e1753e1f579752fc684aaad7a512 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 1e7ccbf..4c00140 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1006,6 +1006,7 @@ { struct mgcp_endpoint *endp = p->endp; struct rate_ctr_group *rate_ctrs = endp->trunk->ratectr.mgcp_mdcx_ctr_group; + char new_local_addr[INET6_ADDRSTRLEN]; int error_code = 500; int silent = 0; int have_sdp = 0; @@ -1170,6 +1171,20 @@ that conn. */ } + /* MDCX may have provided a new remote address, which means we may need + to update our announced IP addr and re-bind our local end. This can + happen for instance if MGW initially provided an IPv4 during CRCX + ACK, and now MDCX tells us the remote has an IPv6 address. */ + mgcp_get_local_addr(new_local_addr, conn); + if (strcmp(new_local_addr, conn->end.local_addr)) { + osmo_strlcpy(conn->end.local_addr, new_local_addr, sizeof(conn->end.local_addr)); + mgcp_free_rtp_port(&conn->end); + if (allocate_port(endp, conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BIND_PORT]); + goto error3; + } + } + if (setup_rtp_processing(endp, conn) != 0) { rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_START_RTP]); goto error3; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iaed424e2c209e1753e1f579752fc684aaad7a512 Gerrit-Change-Number: 19972 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 17:56:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 17:56:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... Patch Set 1: Hi, I'm a patch fixing some TTCN3 tests and I have been waiting for a week to get a +2. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 17:56:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 18:12:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 18:12:33 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Update module param addresses naming to support ipv6 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20041 ) Change subject: ttcn3-mgw: Update module param addresses naming to support ipv6 ...................................................................... ttcn3-mgw: Update module param addresses naming to support ipv6 Depends: osmo-ttcn3-hacks.git Change-Id Ia393d7175de277ec8fa524ba74bf3b150b74c766 Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 --- M ttcn3-mgw-test/MGCP_Test.cfg M ttcn3-mgw-test/jenkins.sh M ttcn3-mgw-test/osmo-mgw.cfg 3 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/20041/1 diff --git a/ttcn3-mgw-test/MGCP_Test.cfg b/ttcn3-mgw-test/MGCP_Test.cfg index 0c6a550..b70514e 100644 --- a/ttcn3-mgw-test/MGCP_Test.cfg +++ b/ttcn3-mgw-test/MGCP_Test.cfg @@ -8,8 +8,10 @@ *.MGWVTY.CTRL_HOSTNAME := "172.18.4.180" [MODULE_PARAMETERS] -mp_local_ip:= "172.18.4.181"; -mp_remote_ip:= "172.18.4.180"; +mp_local_ipv4 := "172.18.4.181"; +mp_local_ipv6 := "fd02:db8:4::181"; +mp_remote_ipv4 := "172.18.4.180"; +mp_remote_ipv6 := "fd02:db8:4::180"; [MAIN_CONTROLLER] diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 228740b..c49096b 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -20,6 +20,8 @@ sed -i "s/e1_line.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg sed -i "s/e1_input.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg sed -i "s/line 0.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg + # Disable IPv6 until osmo-mgw .git release > 1.7.0 is available + sed "/fd02:db8/d" -i $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi # start container with mgw in background diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index 8036058..1c49b11 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -31,6 +31,7 @@ bind port 2427 rtp port-range 4002 16000 rtp bind-ip 172.18.4.180 + rtp bind-ip-v6 fd02:db8:4::180 rtp ip-probing rtp ip-dscp 184 no rtp keep-alive -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 Gerrit-Change-Number: 20041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 18:25:33 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 8 Sep 2020 18:25:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 ) Change subject: library/BSSAP_LE_Types: fix wrong field order in PDU_BSSAP_LE ...................................................................... Patch Set 1: > Given that that in your sample ('000E2B44010005080062F2240017002A'O) contains '00'O at that position, it does not matter which way you place those fields. I know that of course, that's why i hacked the discriminator to be a 1 and checked its position in the resulting message -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie9bbf99df0b189846c8ea3159bfd3c9a0ee5df2a Gerrit-Change-Number: 20015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 08 Sep 2020 18:25:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 18:26:11 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 8 Sep 2020 18:26:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 ) Change subject: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3db7e8784efd067ccf0bc7dbc234d9b4ff1c033c Gerrit-Change-Number: 20016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 08 Sep 2020 18:26:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 18:28:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 8 Sep 2020 18:28:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 ) Change subject: library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes ...................................................................... library/BSSAP_LE_Types: fix: add missing FIELDLENGTH attributes Otherwise TITAN would refuse to decode any messages: Dynamic test case error: While RAW-decoding type '@BSSAP_LE_Types.PDU_BSSAP_LE': Can not decode type '@BSSAP_LE_Types.PDU_BSSAP_LE', because invalid message was received Change-Id: I3db7e8784efd067ccf0bc7dbc234d9b4ff1c033c Related: OS#4597 --- M library/BSSAP_LE_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved neels: Looks good to me, approved diff --git a/library/BSSAP_LE_Types.ttcn b/library/BSSAP_LE_Types.ttcn index ae7385b..604fbe0 100644 --- a/library/BSSAP_LE_Types.ttcn +++ b/library/BSSAP_LE_Types.ttcn @@ -34,7 +34,7 @@ BSSMAP_LE_RESET ('00110000'B), BSSMAP_LE_RESET_ACK ('00110001'B) -}; +} with { variant "FIELDLENGTH(8)" }; /* TS 49.031 Section 10.2 */ type enumerated BSSMAP_LE_IEI { @@ -78,7 +78,7 @@ BSSMAP_LE_IEI_SHORT_ID ('10001110'B), BSSMAP_LE_IEI_COVERAGE_CLASS ('10001111'B), BSSMAP_LE_IEI_MTA_ACC_SEC_RQD ('10010000'B) -}; +} with { variant "FIELDLENGTH(8)" }; /* Section 9.1 */ type record BSSMAP_LE_PerfLocReq { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3db7e8784efd067ccf0bc7dbc234d9b4ff1c033c Gerrit-Change-Number: 20016 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 18:58:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 8 Sep 2020 18:58:08 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 24: (23 comments) Without knowing much about the context of this patch, I'd say it still needs a general review from its author to clean up stuff. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 26 PS24, Line 26: /* TODO: remove ! */ so we have a TODO: remove on a struct in a public header? That looks wrong ;) https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 40 PS24, Line 40: NS2_VC_MODE_BLOCKRESET, /* The will only use ALIVE/ACK no initiation */ "The VC will" "on initiation"? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 85 PS24, Line 85: /* TODO: implement resource distribution */ So future ABI break? Can we keep the structure private? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 117 PS24, Line 117: [NS_IE_IP_ADDR] = { TLV_TYPE_FIXED, 5 }, So parsing is going to fail for ipv6? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 217 PS24, Line 217: snprintf(buf, buf_len, "udp)%s:%u<%u>%s:%u", Ideally IPv6 should be enclosed in between breackets ([]) BTW, why is there no matching parenthesis, only ")" ? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 227 PS24, Line 227: snprintf(buf, buf_len, "frgre)"); missing break? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 229 PS24, Line 229: snprintf(buf, buf_len, "e1)"); missing break? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 248 PS24, Line 248: char *buf = talloc_size(ctx, INET6_ADDRSTRLEN+10); shouldn't this be INET6_ADDRSTRLEN*2 ? and +10 doesn't seem enough to me. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 346 PS24, Line 346: llist_add(&nsvc->list, &nse->nsvc); Easiest here is to add to several lists at the end before returning, then you can drop 2 lines from "err:" https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 395 PS24, Line 395: if (nsvc->priv && nsvc->bind->free_vc) { uneeded {} https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 408 PS24, Line 408: "GPRS/NS"); move to be in line with "(". https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 420 PS24, Line 420: * \param[out] result this documenttion needs updating. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 554 PS24, Line 554: * \param[out] reject A message filled to be sent back. Only used in failure cases. docuemntation needs updating https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 675 PS24, Line 675: * \brief gprs_ns2_ip_connect documentation needs updating. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 882 PS24, Line 882: static bool gprs_fsm_vc_registered = false; what about this? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c at 477 PS24, Line 477: /* FIXME: actually send the data here instead of nsip_sendmsg() */ This is yet not implemented? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c at 524 PS24, Line 524: rc = handle_nsfrgre_read(bfd); Usual stuff: check if handle_nsfrgre_read() can cause the struct holding bfd to be freed. In those paths, return -EBADF and check that in next if here. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c File src/gb/gprs_ns2_message.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c at 43 PS24, Line 43: #define ERR_IF_NSVC_USES_SNS(nsvc, reason) \ ? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c at 64 PS24, Line 64: int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) returning 1 or 0? this looks strange... https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c at 268 PS24, Line 268: remote.u.sin6.sin6_port = ip6->udp_port; be careful, you may need htons() here https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c at 301 PS24, Line 301: remote.u.sin.sin_port = ip4->udp_port; htons? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c at 336 PS24, Line 336: remote.u.sin6.sin6_port = ip6->udp_port; htons? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_vc_fsm.c at 121 PS24, Line 121: { GPRS_NS2_EV_BLOCK, "BLOCK" }, weird indentation -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 24 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 18:58:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 19:04:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 19:04:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... Patch Set 1: Code-Review+2 1 + 1 == 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 19:04:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 19:04:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 19:04:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 ) Change subject: PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() ...................................................................... PCU_Tests: introduce and use f_TC_pcuif_fh_params_gen() Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Related: SYS#4868, OS#4547 --- M pcu/PCU_Tests.ttcn 1 file changed, 19 insertions(+), 30 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 9bcf9c6..2d20975 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2161,6 +2161,15 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Randomly generate a set of hopping parameters for one timeslot */ +private function f_TC_pcuif_fh_params_gen(integer ma_len) +return template (value) PCUIF_InfoTrxTs { + return ts_PCUIF_InfoTrxTsH1(tsc := f_rnd_int(7), + hsn := f_rnd_int(63), + maio := f_rnd_int(63), + ma := f_rnd_bitstring(ma_len)); +} + private function f_TC_pcuif_fh_check_imm_ass(in PCUIF_info_ind info_ind, in GsmRrMessage rr_msg) { @@ -2210,12 +2219,8 @@ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(32)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(32); /* Initialize the PCU interface abstraction */ f_init_raw(testcasename(), info_ind); @@ -2235,12 +2240,8 @@ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(32)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(32); /* Initialize the PCU interface abstraction */ f_init_raw(testcasename(), info_ind); @@ -2257,12 +2258,8 @@ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(16)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(16); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -2331,12 +2328,8 @@ var GprsMS ms := valueof(t_GprsMS_def); var uint32_t poll_fn; - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(33)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(33); /* Initialize the PCU interface abstraction */ f_init_raw(testcasename(), info_ind); @@ -2377,12 +2370,8 @@ var RlcmacDlBlock dl_block; var uint32_t poll_fn; - /* Enable frequency hopping of TRX0/TS7 */ - info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( - tsc := f_rnd_int(7), - hsn := f_rnd_int(63), - maio := f_rnd_int(63), - ma := f_rnd_bitstring(33)); + /* Enable frequency hopping on TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := f_TC_pcuif_fh_params_gen(33); /* Initialize NS/BSSGP side */ f_init_bssgp(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I297b52410afafedad51d5b51734e946c4d62e8d2 Gerrit-Change-Number: 19990 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 19:04:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 19:04:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add Mobile Allocation length field In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 ) Change subject: library/PCUIF_Types: version 10: add Mobile Allocation length field ...................................................................... library/PCUIF_Types: version 10: add Mobile Allocation length field My initial assumption was that we can skip redundant '0'B bits or even '00'O octets in the Mobile Allocation IE, and thus reduce the overall size of this element. Unfortunately, this is wrong. 3GPP TS 44.018, section 10.5.2.21 clearly states that the Mobile Allocation IE contains a bit-string of size NF, where NF is the number of frequencies in the cell allocation. If NF % 8 != 0, then '0'B padding bits must be appended to make it octet-aligned. In other words, if the cell allocation contains let's say 13 frequencies, but a hopping timeslot makes use of only a small fraction of it (e.g. 4 first channels), we would still need to transmit at least 13 bits (+padding), including all redundant bits and octets. In RLC/MAC frames though it's not required to make the bit-string octet aligned, so we need to send exactly NF bits without padding. In order to achieve that: a) add MA length field to INFO.ind (record PCUIF_InfoTrxTs); b) ajust the existing test cases to use this field. It's safe to merge this change as the related patches have not been merged to osmo-pcu and osmo-bts yet. Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Related: SYS#4868, OS#4547 --- M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 15 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 8144d97..f0200af 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -145,6 +145,7 @@ uint8_t hopping, uint8_t hsn, uint8_t maio, + uint8_t ma_bit_len, bitstring ma length(64) } with { variant (ma) "BYTEORDER(first), BITORDER(msb)" }; private type record length(8) of PCUIF_InfoTrxTs PCUIF_InfoTrxTsList; @@ -709,12 +710,14 @@ tsc := tsc, hopping := 0, hsn := 0, maio := 0, + ma_bit_len := 0, ma := f_pad_bit(''B, 64, '0'B) }; template PCUIF_InfoTrxTs tr_PCUIF_InfoTrxTsH0(template uint3_t tsc := ?) := { tsc := tsc, hopping := 0, hsn := ?, maio := ?, + ma_bit_len := ?, ma := ? }; @@ -726,16 +729,19 @@ hopping := 1, hsn := hsn, maio := maio, + ma_bit_len := lengthof(valueof(ma)), ma := f_pad_bit(valueof(ma), 64, '0'B) }; template PCUIF_InfoTrxTs tr_PCUIF_InfoTrxTsH1(template uint3_t tsc := ?, template uint6_t hsn := ?, template uint6_t maio := ?, - template bitstring ma := ?) := { + template bitstring ma := ?, + template uint8_t ma_bit_len := ?) := { tsc := tsc, hopping := 1, hsn := hsn, maio := maio, + ma_bit_len := ma_bit_len, ma := ma }; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 2d20975..a4596bf 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2193,18 +2193,12 @@ ia.pkt_chan_desc, " vs ", tr_pkt_chan_desc); } - var MobileAllocationLV tr_ma := { len := 0, ma := ''B }; - var octetstring ma_oct := bit2oct(ts.ma); - - /* Calculate length of the useful part of Mobile Allocation */ - for (var integer i := 0; i < lengthof(ma_oct); i := i + 1) { - if (ma_oct[i] != '00'O) { - tr_ma.len := i + 1; - } - } - - /* Strip zero bytes from the right side of MA */ - tr_ma.ma := substr(ts.ma, 0, tr_ma.len * 8); + /* Mobile Allocation is expected to be octet-aligned */ + var uint8_t ma_oct_len := (ts.ma_bit_len + 8 - 1) / 8; + var template MobileAllocationLV tr_ma := { + len := ma_oct_len, /* in bytes */ + ma := substr(ts.ma, 0, ma_oct_len * 8) + }; if (not match(ia.mobile_allocation, tr_ma)) { setverdict(fail, "Mobile Allocation does not match: ", @@ -2284,14 +2278,6 @@ { /* FIXME: TRX0/TS7 is a hard-coded expectation, make it configurable */ var PCUIF_InfoTrxTs ts := info_ind.trx.v10[0].ts[7]; - var integer ma_bit_len := 0; - - /* Calculate length of the useful part of Mobile Allocation */ - for (var integer i := 0; i < lengthof(ts.ma); i := i + 1) { - if (ts.ma[i] == '1'B) { - ma_bit_len := i + 1; - } - } /* Table 12.8.1: Frequency Parameters information elements */ var template FrequencyParameters tr_fp := { @@ -2307,8 +2293,8 @@ rfl_number_list_present := '0'B, rfl_number_list := omit, ma_present := '0'B, /* inverted logic */ - ma_length := ma_bit_len, - ma_bitmap := substr(ts.ma, 0, ma_bit_len) + ma_length := ts.ma_bit_len, + ma_bitmap := substr(ts.ma, 0, ts.ma_bit_len) } }, direct2 := omit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2709673c90a0cd7d76de9db8b8ad82ac59ca84a0 Gerrit-Change-Number: 19991 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 19:04:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 19:04:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 ) Change subject: PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() ...................................................................... PCU_Tests: randomize MA length in f_TC_pcuif_fh_params_gen() This way we also test different variations of MA length. Change-Id: Id886ed72c8a03fe2b27bc7add74eb0f58a2fe6ff Related: SYS#4868, OS#4547 --- M pcu/PCU_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a4596bf..df2964c 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2162,8 +2162,11 @@ } /* Randomly generate a set of hopping parameters for one timeslot */ -private function f_TC_pcuif_fh_params_gen(integer ma_len) +private function f_TC_pcuif_fh_params_gen(integer max_ma_len) return template (value) PCUIF_InfoTrxTs { + /* Pick a random MA length in range 2 .. max_ma_len */ + var integer ma_len := 2 + f_rnd_int(max_ma_len - 2); + return ts_PCUIF_InfoTrxTsH1(tsc := f_rnd_int(7), hsn := f_rnd_int(63), maio := f_rnd_int(63), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id886ed72c8a03fe2b27bc7add74eb0f58a2fe6ff Gerrit-Change-Number: 20010 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 19:09:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 19:09:50 +0000 Subject: Change in osmo-bsc[master]: abis_om2000: check result of gsm_bts_trx_set_system_infos() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19965 to look at the new patch set (#2). Change subject: abis_om2000: check result of gsm_bts_trx_set_system_infos() ...................................................................... abis_om2000: check result of gsm_bts_trx_set_system_infos() Ensure that osmo-bsc would not continue to work as usual, if for some reason we cannot encode or send System Information messages. Introduce transitional state OM2K_TRX_S_SEND_SI, from where we can generate and send System Information messages. Otherwise it's confusing if we fail to do something when we're already in state OM2K_TRX_S_DONE. Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/19965/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 Gerrit-Change-Number: 19965 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:10:51 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 20:10:51 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19954 ) Change subject: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... Patch Set 2: Verified+1 Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19954/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/19954/2//COMMIT_MSG at 36 PS2, Line 36: BSC <- MGW: MDCX ACK (here MGW changes its local addr to IPv6 We are going from IPv6 to IPv4 on the MGW side, but here you say that the MGW chanes to IPv6? Closing ')' missing. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 20:10:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:17:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:17:49 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: handle failed transfers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 ) Change subject: usb: handle failed transfers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icff17673b4d1d1616ee733580bdd6b5203b87139 Gerrit-Change-Number: 20040 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 20:17:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:17:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:17:51 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: handle failed transfers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 ) Change subject: usb: handle failed transfers ...................................................................... usb: handle failed transfers This fixes the crash with external power if usb is disconected and plugged in again, upon ep reset the completion cbs are called, but we can obviously not interact with those EPs at that time and resubmit buffers. Change-Id: Icff17673b4d1d1616ee733580bdd6b5203b87139 Closes: SYS#4908 --- M sysmoOCTSIM/main.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 08f38ec..101af30 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -230,6 +230,9 @@ llist_add_tail_at(&msg->list, &g_ccid_s.out_ep.list); g_ccid_s.out_ep.in_progress = NULL; + if(code != USB_XFER_DONE) + return; + /* submit another [free] msgb to receive the next transfer */ submit_next_out(); } @@ -244,6 +247,9 @@ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); g_ccid_s.in_ep.in_progress = NULL; + if(code != USB_XFER_DONE) + return; + /* submit the next pending to-be-transmitted msgb (if any) */ submit_next_in(); } @@ -258,6 +264,9 @@ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); g_ccid_s.irq_ep.in_progress = NULL; + if(code != USB_XFER_DONE) + return; + /* submit the next pending to-be-transmitted msgb (if any) */ submit_next_irq(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icff17673b4d1d1616ee733580bdd6b5203b87139 Gerrit-Change-Number: 20040 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:18:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:18:32 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 20:18:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:18:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:18:42 +0000 Subject: Change in osmo-bsc[master]: vty: propagate result of gsm_bts_set_system_infos() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19963 ) Change subject: vty: propagate result of gsm_bts_set_system_infos() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id8a761593fe89cc07c2fb6e69558f44494537c47 Gerrit-Change-Number: 19963 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 20:18:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:18:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:18:52 +0000 Subject: Change in osmo-bsc[master]: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19964 ) Change subject: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7d3458fb10760e33411f2074a6b2df1c257438d5 Gerrit-Change-Number: 19964 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 20:18:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:19:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:19:15 +0000 Subject: Change in osmo-bsc[master]: abis_om2000: check result of gsm_bts_trx_set_system_infos() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19965 ) Change subject: abis_om2000: check result of gsm_bts_trx_set_system_infos() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 Gerrit-Change-Number: 19965 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 20:19:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:19:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:19:18 +0000 Subject: Change in osmo-bsc[master]: SI Type 4: prevent potential buffer overflow In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19962 ) Change subject: SI Type 4: prevent potential buffer overflow ...................................................................... SI Type 4: prevent potential buffer overflow Make sure that in generate_si4() we do not corrupt other SI buffers by limiting maximum length of the Mobile Allocation to 2 octets. This would preserve at least 2 octets for the Rest Octets, what should be enough to encode at least GPRS Indicator. Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Related: SYS#4868, OS#4545 --- M src/osmo-bsc/system_information.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 2418e32..b969989 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -974,6 +974,9 @@ /* 10.5.2.21 (TLV) CBCH Mobile Allocation IE */ if (ts->hopping.enabled) { + /* Prevent potential buffer overflow */ + if (ts->hopping.ma_len > 2) + return -ENOMEM; tail = tlv_put(tail, GSM48_IE_CBCH_MOB_AL, ts->hopping.ma_len, ts->hopping.ma_data); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e3553865096faecda6bb22fc25b83fd47b738c4 Gerrit-Change-Number: 19962 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:19:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:19:19 +0000 Subject: Change in osmo-bsc[master]: vty: propagate result of gsm_bts_set_system_infos() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19963 ) Change subject: vty: propagate result of gsm_bts_set_system_infos() ...................................................................... vty: propagate result of gsm_bts_set_system_infos() We should not return CMD_SUCCESS if this functions fails. Change-Id: Id8a761593fe89cc07c2fb6e69558f44494537c47 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index e588ba2..3524506 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3684,7 +3684,11 @@ if (acc_ramp_is_enabled(&bts->acc_ramp)) { acc_ramp_abort(&bts->acc_ramp); acc_ramp_set_enabled(&bts->acc_ramp, false); - gsm_bts_set_system_infos(bts); + if (gsm_bts_set_system_infos(bts) != 0) { + vty_out(vty, "%% Filed to (re)generate System Information " + "messages, check the logs%s", VTY_NEWLINE); + return CMD_WARNING; + } } return CMD_SUCCESS; @@ -4828,7 +4832,11 @@ return CMD_WARNING; } - gsm_bts_set_system_infos(bts); + if (gsm_bts_set_system_infos(bts) != 0) { + vty_out(vty, "%% Filed to (re)generate System Information " + "messages, check the logs%s", VTY_NEWLINE); + return CMD_WARNING; + } return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id8a761593fe89cc07c2fb6e69558f44494537c47 Gerrit-Change-Number: 19963 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:19:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:19:19 +0000 Subject: Change in osmo-bsc[master]: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19964 ) Change subject: fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() ...................................................................... fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() Ensure that osmo-bsc would not continue to work as usual, if for some reason we cannot encode or send System Information messages. Change-Id: I7d3458fb10760e33411f2074a6b2df1c257438d5 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index ebae0a2..560f8fd 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -308,7 +308,10 @@ if (trx_is_usable(trx)) acc_ramp_trigger(&trx->bts->acc_ramp); - gsm_bts_trx_set_system_infos(trx); + if (gsm_bts_trx_set_system_infos(trx) != 0) { + LOG_TRX(trx, DRSL, LOGL_ERROR, "Failed to generate System Information\n"); + return; + } if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { /* channel unspecific, power reduction in 2 dB steps */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7d3458fb10760e33411f2074a6b2df1c257438d5 Gerrit-Change-Number: 19964 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:20:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 8 Sep 2020 20:20:25 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 08 Sep 2020 20:20:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:27:48 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 20:27:48 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 08 Sep 2020 20:27:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:47:46 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 20:47:46 +0000 Subject: Change in osmo-mgw[master]: mgw: Release endpoint after last conn times out In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20030 ) Change subject: mgw: Release endpoint after last conn times out ...................................................................... Patch Set 1: Verified+1 Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/20030/1/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/20030/1/src/libosmo-mgcp/mgcp_endp.c at 682 PS1, Line 682: llist_del(&conn->entry); This is the essence of the patch, maybe a comment makes sense? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f Gerrit-Change-Number: 20030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 08 Sep 2020 20:47:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 20:49:20 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 20:49:20 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Fix conn watchdog timeout not updated In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20031 ) Change subject: mgw: osmux: Fix conn watchdog timeout not updated ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id592d7db7b9399a497176e0d28cc826b3bce48c0 Gerrit-Change-Number: 20031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 08 Sep 2020 20:49:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 21:03:09 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 21:03:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 ) Change subject: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980/2/bsc/BSC_Tests.ttcn at 7532 PS2, Line 7532: execute( TC_ho_into_this_bsc() ); I wonder why this one does not need the check for AoIP transport... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 Gerrit-Change-Number: 19980 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 21:03:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 21:07:42 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 21:07:42 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Update module param addresses naming to support ipv6 In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20041 ) Change subject: ttcn3-mgw: Update module param addresses naming to support ipv6 ...................................................................... Patch Set 1: Code-Review+1 looks good to me, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 Gerrit-Change-Number: 20041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 08 Sep 2020 21:07:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 21:17:28 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 8 Sep 2020 21:17:28 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19982/4/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19982/4/src/libmsc/ran_msg_a.c at 609 PS4, Line 609: if (ie_aoip_transp_addr) { looks like the indentation is off now (do/while removed) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Sep 2020 21:17:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 21:52:43 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 8 Sep 2020 21:52:43 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 24: (28 comments) https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 26 PS24, Line 26: /* TODO: remove ! */ > so we have a TODO: remove on a struct in a public header? That looks wrong ;) Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 40 PS24, Line 40: NS2_VC_MODE_BLOCKRESET, /* The will only use ALIVE/ACK no initiation */ > "The VC will" [?] Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 85 PS24, Line 85: /* TODO: implement resource distribution */ > So future ABI break? [?] I'll out comment the link selector parameter. If we add stuff here, it won't ABI breakage, since it's only adding things. https://gerrit.osmocom.org/c/libosmocore/+/19417/23/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/23/include/osmocom/gprs/gprs_ns2.h at 26 PS23, Line 26: /* TODO: remove ! */ TODO remove https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 25 PS22, Line 25: enum gprs_ns2_signal_ns { : S_NSVC_RESET, /* when a NSVC is in reset */ : S_NSVC_BLOCK, /* when a NSVC become blocked */ : S_NSVC_UNBLOCK, /* when a NSVC become unblocked */ : S_NSVC_ALIVE_EXP, /* Tns-alive expired more than N times */ : S_NSVC_REPLACED, /* nsvc object is replaced (sets old_nsvc) */ : S_NSVC_MISMATCH, /* got an unexpected IE (sets msg, pdu_type, ie_type) */ : S_NSVC_DELETED, /* when a NSVC gets deleted */ : S_SNS_CONFIGURED, /* IP-SNS configuration completed */ : S_NSE_AVAILABLE, /* NSE is available */ : S_NSE_UNAVAILABLE, /* NSE is unavailable */ : }; : : struct gprs_ns2_signal_data { : struct gprs_ns2_nse *nse; : uint16_t nsei; : struct gprs_ns2_vc *nsvc; : struct gprs_ns2_vc *old_nsvc; : uint8_t cause; : uint8_t pdu_type; : uint8_t ie_type; : struct msgb *msg; : }; : : enum gprs_ns2_vc_mode { : NS2_VC_MODE_ALIVE, /* The VC will use RESET/BLOCK/UNBLOCK to start the connection and do ALIVE/ACK */ : NS2_VC_MODE_BLOCKRESET, /* The will only use ALIVE/ACK no initiation */ : }; : : /*! Osmoco NS events */ : enum gprs_ns2_evt { : GPRS_NS_EVT_UNIT_DATA, : }; : : /* callbacks for messages transfer */ : /*! Osmocom GPRS callback function type */ : typedef int gprs_ns2_cb_t(enum gprs_ns2_evt event, struct msgb *msg, : uint16_t nsei, uint16_t bvci); > I agree. I wasn't sure if it would be good to add even more time into it. Done https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 65 PS22, Line 65: gprs_ns2_cb_t > this would then be a call-back that receives msgb-wrapped osmo_prim from NS to the NS-user Done https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 71 PS22, Line 71: int gprs_ns2_send(struct gprs_ns2_inst *inst,struct msgb *msg); : int gprs_ns2_send_nse(struct gprs_ns2_nse *nse, struct msgb *msg); : int gprs_ns2_send_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei, struct msgb *msg); : int gprs_ns2_recv_vc(struct gprs_ns2_inst *nsi, : struct gprs_ns2_vc *nsvc, : struct msgb *msg); > and those would basically be convenience wrapper functions which generate a msgb-wrapped osmo_prim s [?] Done https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 86 PS22, Line 86: int gprs_ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause); : int gprs_ns2_tx_block_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause); : int gprs_ns2_tx_reset_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_unblock(struct gprs_ns2_vc *nsvc); : int gprs_ns2_tx_unblock_ack(struct gprs_ns2_vc *nsvc); : : int gprs_ns2_tx_alive(struct gprs_ns2_vc *nsvc); : int gprs_ns2_tx_alive_ack(struct gprs_ns2_vc *nsvc); > Ack Done https://gerrit.osmocom.org/c/libosmocore/+/19417/22/include/osmocom/gprs/gprs_ns2.h at 104 PS22, Line 104: nt gprs_ns2_tx_sns_ack(struct gprs_ns2_vc *nsvc, uint8_t trans_id, uint8_t *cause, : const struct gprs_ns_ie_ip4_elem *ip4_elems, : unsigned int num_ip4_elems, : const struct gprs_ns_ie_ip6_elem *ip6_elems, : unsigned int num_ip6_elems); : int gprs_ns2_tx_sns_config(struct gprs_ns2_vc *nsvc, bool end_flag, : const struct gprs_ns_ie_ip4_elem *ip4_elems, : unsigned int num_ip4_elems, : const struct gprs_ns_ie_ip6_elem *ip6_elems, : unsigned int num_ip6_elems); : int gprs_ns2_tx_sns_config_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); : int gprs_ns2_tx_sns_size(struct gprs_ns2_vc *nsvc, bool reset_flag, uint16_t max_nr_nsvc, : int ip4_ep_nr, int ip6_ep_nr); : int gprs_ns2_tx_sns_size_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); > Ack Done https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 217 PS24, Line 217: snprintf(buf, buf_len, "udp)%s:%u<%u>%s:%u", > Ideally IPv6 should be enclosed in between breackets ([]) [?] Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 227 PS24, Line 227: snprintf(buf, buf_len, "frgre)"); > missing break? Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 229 PS24, Line 229: snprintf(buf, buf_len, "e1)"); > missing break? Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 248 PS24, Line 248: char *buf = talloc_size(ctx, INET6_ADDRSTRLEN+10); > shouldn't this be INET6_ADDRSTRLEN*2 ? and +10 doesn't seem enough to me. Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 346 PS24, Line 346: llist_add(&nsvc->list, &nse->nsvc); > Easiest here is to add to several lists at the end before returning, then you can drop 2 lines from [?] Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 395 PS24, Line 395: if (nsvc->priv && nsvc->bind->free_vc) { > uneeded {} Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 408 PS24, Line 408: "GPRS/NS"); > move to be in line with "(". Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 420 PS24, Line 420: * \param[out] result > this documenttion needs updating. Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 554 PS24, Line 554: * \param[out] reject A message filled to be sent back. Only used in failure cases. > docuemntation needs updating Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 675 PS24, Line 675: * \brief gprs_ns2_ip_connect > documentation needs updating. Ack https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 882 PS24, Line 882: static bool gprs_fsm_vc_registered = false; > what about this? I don't care. Just took this over from NS1. What would be a better solution? Create a second function to init it? Or should I use a constructor? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c at 477 PS24, Line 477: /* FIXME: actually send the data here instead of nsip_sendmsg() */ > This is yet not implemented? Yes. I don't have a test case or a device to test against it. I would postpone this code until we have a real setup. The whole file also needs more work (e.g. IPv6 extension header). https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c at 524 PS24, Line 524: rc = handle_nsfrgre_read(bfd); > Usual stuff: check if handle_nsfrgre_read() can cause the struct holding bfd to be freed. [?] Did I missed the free? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c File src/gb/gprs_ns2_message.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c at 43 PS24, Line 43: #define ERR_IF_NSVC_USES_SNS(nsvc, reason) \ > ? i'll remove this https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c at 64 PS24, Line 64: int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) > returning 1 or 0? this looks strange... what do you mean? https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c at 268 PS24, Line 268: remote.u.sin6.sin6_port = ip6->udp_port; > be careful, you may need htons() here no https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c at 301 PS24, Line 301: remote.u.sin.sin_port = ip4->udp_port; > htons? no https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_sns.c at 336 PS24, Line 336: remote.u.sin6.sin6_port = ip6->udp_port; > htons? no https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_vc_fsm.c at 121 PS24, Line 121: { GPRS_NS2_EV_BLOCK, "BLOCK" }, > weird indentation Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 24 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Sep 2020 21:52:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 22:17:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 22:17:57 +0000 Subject: Change in libosmocore[master]: logging: refactor and simplify log_target_destroy() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20042 ) Change subject: logging: refactor and simplify log_target_destroy() ...................................................................... logging: refactor and simplify log_target_destroy() Change-Id: Ic6b9906e6fd24de6af9c869348c100d9ef6a7df6 --- M src/logging.c 1 file changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/20042/1 diff --git a/src/logging.c b/src/logging.c index c14e696..78abc19 100644 --- a/src/logging.c +++ b/src/logging.c @@ -959,16 +959,14 @@ log_del_target(target); #if (!EMBEDDED) - if (target->output == &_file_output) { -/* since C89/C99 says stderr is a macro, we can safely do this! */ -#ifdef stderr - /* don't close stderr */ - if (target->tgt_file.out != stderr) -#endif - { - fclose(target->tgt_file.out); - target->tgt_file.out = NULL; - } + switch (target->type) { + case LOG_TGT_TYPE_FILE: + fclose(target->tgt_file.out); + target->tgt_file.out = NULL; + break; + default: + /* make GCC happy */ + break; } #endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic6b9906e6fd24de6af9c869348c100d9ef6a7df6 Gerrit-Change-Number: 20042 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 22:17:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 22:17:58 +0000 Subject: Change in libosmocore[master]: logging: fix log_target_destroy(): properly close syslog References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20043 ) Change subject: logging: fix log_target_destroy(): properly close syslog ...................................................................... logging: fix log_target_destroy(): properly close syslog Change-Id: I122445e8ee842b5f807d21a272520648660e7e65 --- M src/logging.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/20043/1 diff --git a/src/logging.c b/src/logging.c index 78abc19..80ff72c 100644 --- a/src/logging.c +++ b/src/logging.c @@ -39,6 +39,11 @@ #ifdef HAVE_STRINGS_H #include #endif + +#ifdef HAVE_SYSLOG_H +#include +#endif + #include #include #include @@ -964,6 +969,11 @@ fclose(target->tgt_file.out); target->tgt_file.out = NULL; break; +#ifdef HAVE_SYSLOG_H + case LOG_TGT_TYPE_SYSLOG: + closelog(); + break; +#endif /* HAVE_SYSLOG_H */ default: /* make GCC happy */ break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I122445e8ee842b5f807d21a272520648660e7e65 Gerrit-Change-Number: 20043 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 22:17:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 22:17:58 +0000 Subject: Change in libosmocore[master]: logging: fix memleak in log_target_create_file() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20044 ) Change subject: logging: fix memleak in log_target_create_file() ...................................................................... logging: fix memleak in log_target_create_file() Change-Id: If16d8c6417698bbb5cf87716f9507c7256aeaecb --- M src/logging.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/20044/1 diff --git a/src/logging.c b/src/logging.c index 80ff72c..db04cf7 100644 --- a/src/logging.c +++ b/src/logging.c @@ -915,8 +915,10 @@ target->type = LOG_TGT_TYPE_FILE; target->tgt_file.out = fopen(fname, "a"); - if (!target->tgt_file.out) + if (!target->tgt_file.out) { + log_target_destroy(target); return NULL; + } target->output = _file_output; @@ -966,6 +968,8 @@ #if (!EMBEDDED) switch (target->type) { case LOG_TGT_TYPE_FILE: + if (target->tgt_file.out == NULL) + break; fclose(target->tgt_file.out); target->tgt_file.out = NULL; break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If16d8c6417698bbb5cf87716f9507c7256aeaecb Gerrit-Change-Number: 20044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 8 22:17:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 8 Sep 2020 22:17:59 +0000 Subject: Change in libosmocore[master]: logging: introduce experimental systemd journal target References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20045 ) Change subject: logging: introduce experimental systemd journal target ...................................................................... logging: introduce experimental systemd journal target TODO Change-Id: I609f5cf438e6ad9038d8fc95f00add6aac29fb23 --- M configure.ac M include/osmocom/core/logging.h M src/Makefile.am A src/logging_systemd.c M src/vty/logging_vty.c 5 files changed, 153 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/20045/1 diff --git a/configure.ac b/configure.ac index b07a3bd..b028058 100644 --- a/configure.ac +++ b/configure.ac @@ -181,6 +181,19 @@ AC_DEFINE([USE_GNUTLS], [1], [Use GnuTLS as a fallback for missing getrandom()]) fi +AC_ARG_ENABLE([systemd_logging], + [AS_HELP_STRING( + [--enable-systemd-logging], + [Build with systemd journal logging support] + )], + [systemd_logging=$enableval], [systemd_logging="no"]) +AS_IF([test "x$systemd_logging" = "xyes"], [ + PKG_CHECK_MODULES(SYSTEMD, libsystemd) + AC_DEFINE([ENABLE_SYSTEMD_LOGGING], [1], [Enable systemd journalctl logging target]) +]) +AM_CONDITIONAL(ENABLE_SYSTEMD_LOGGING, test "x$systemd_logging" = "xyes") +AC_SUBST(ENABLE_SYSTEMD_LOGGING) + AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) AM_CONDITIONAL(ENABLE_LIBSCTP, test x"$ENABLE_LIBSCTP" = x"yes") diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 79eec10..7150b8b 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -243,6 +243,7 @@ LOG_TGT_TYPE_STDERR, /*!< stderr logging */ LOG_TGT_TYPE_STRRB, /*!< osmo_strrb-backed logging */ LOG_TGT_TYPE_GSMTAP, /*!< GSMTAP network logging */ + LOG_TGT_TYPE_SYSTEMD, /*!< systemd journal logging */ }; /*! Whether/how to log the source filename (and line number). */ @@ -391,6 +392,7 @@ const char *ident, bool ofd_wq_mode, bool add_sink); +struct log_target *log_target_create_systemd(void); int log_target_file_reopen(struct log_target *tgt); int log_targets_reopen(void); diff --git a/src/Makefile.am b/src/Makefile.am index 891b4a6..b2c9204 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -71,5 +71,10 @@ libosmocore_la_SOURCES += serial.c endif +if ENABLE_SYSTEMD_LOGGING +libosmocore_la_SOURCES += logging_systemd.c +libosmocore_la_LIBADD += $(SYSTEMD_LIBS) +endif + crc%gen.c: crcXXgen.c.tpl $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ diff --git a/src/logging_systemd.c b/src/logging_systemd.c new file mode 100644 index 0000000..7633217 --- /dev/null +++ b/src/logging_systemd.c @@ -0,0 +1,74 @@ +/* + * (C) 2020 by Vadim Yanitskiy + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * 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. + * + */ + +/*! \addtogroup logging + * @{ + * \file logging_systemd.c */ + +#include + +#include + +#include +#include +#include + +/* FIXME: copy-pasted from logging_syslog.c */ +static int logp2syslog_level(unsigned int level) +{ + if (level >= LOGL_FATAL) + return LOG_CRIT; + else if (level >= LOGL_ERROR) + return LOG_ERR; + else if (level >= LOGL_NOTICE) + return LOG_NOTICE; + else if (level >= LOGL_INFO) + return LOG_INFO; + else + return LOG_DEBUG; +} + +static void _systemd_output(struct log_target *target, + unsigned int level, const char *log) +{ + /* systemd accepts the same level constants as syslog */ + sd_journal_print(logp2syslog_level(level), "%s", log); +} + +/*! Create a new logging target for systemd journal logging. + * \returns Log target in case of success, NULL in case of error. + */ +struct log_target *log_target_create_systemd(void) +{ + struct log_target *target; + + target = log_target_create(); + if (!target) + return NULL; + + target->type = LOG_TGT_TYPE_SYSTEMD; + target->output = _systemd_output; + + return target; +} + +/* @} */ diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 0e1782a..0471ca6 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -731,6 +731,60 @@ } #endif /* HAVE_SYSLOG_H */ +DEFUN(cfg_log_systemd, cfg_log_systemd_cmd, + "log systemd", + LOG_STR "Logging to systemd journal\n") +{ +#ifdef ENABLE_SYSTEMD_LOGGING + struct log_target *tgt; + + log_tgt_mutex_lock(); + tgt = log_target_find(LOG_TGT_TYPE_SYSTEMD, NULL); + if (tgt == NULL) { + tgt = log_target_create_systemd(); + if (tgt == NULL) { + vty_out(vty, "%% Unable to create systemd journal " + "log target%s", VTY_NEWLINE); + RET_WITH_UNLOCK(CMD_WARNING); + } + log_add_target(tgt); + } + + vty->index = tgt; + vty->node = CFG_LOG_NODE; + + RET_WITH_UNLOCK(CMD_SUCCESS); +#else + vty_out(vty, "%% systemd journal logging is not available " + "in this build of libosmocore%s", VTY_NEWLINE); + return CMD_WARNING; +#endif /* ENABLE_SYSTEMD_LOGGING */ +} + +DEFUN(cfg_no_log_systemd, cfg_no_log_systemd_cmd, + "no log systemd", + NO_STR LOG_STR "Logging to systemd journal\n") +{ +#ifdef ENABLE_SYSTEMD_LOGGING + struct log_target *tgt; + + log_tgt_mutex_lock(); + tgt = log_target_find(LOG_TGT_TYPE_SYSTEMD, NULL); + if (!tgt) { + vty_out(vty, "%% No systemd logging active%s", VTY_NEWLINE); + RET_WITH_UNLOCK(CMD_WARNING); + } + + log_target_destroy(tgt); + + RET_WITH_UNLOCK(CMD_SUCCESS); +#else + vty_out(vty, "%% systemd journal logging is not available " + "in this build of libosmocore%s", VTY_NEWLINE); + return CMD_WARNING; +#endif /* ENABLE_SYSTEMD_LOGGING */ +} + DEFUN(cfg_log_gsmtap, cfg_log_gsmtap_cmd, "log gsmtap [HOSTNAME]", LOG_STR "Logging via GSMTAP\n" @@ -924,6 +978,9 @@ vty_out(vty, "log gsmtap %s%s", tgt->tgt_gsmtap.hostname, VTY_NEWLINE); break; + case LOG_TGT_TYPE_SYSTEMD: + vty_out(vty, "log systemd%s", VTY_NEWLINE); + break; } vty_out(vty, " logging filter all %u%s", @@ -1125,5 +1182,7 @@ install_element(CONFIG_NODE, &cfg_log_syslog_local_cmd); install_element(CONFIG_NODE, &cfg_no_log_syslog_cmd); #endif + install_element(CONFIG_NODE, &cfg_log_systemd_cmd); + install_element(CONFIG_NODE, &cfg_no_log_systemd_cmd); install_element(CONFIG_NODE, &cfg_log_gsmtap_cmd); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I609f5cf438e6ad9038d8fc95f00add6aac29fb23 Gerrit-Change-Number: 20045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Sep 9 01:44:31 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 Sep 2020 01:44:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f58338d819ed_12d02af35bf545f0182048a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 163s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 163s] [COMPILING libboard/qmod/source/card_pres.c] [ 164s] [COMPILING libboard/qmod/source/wwan_led.c] [ 164s] [COMPILING libboard/qmod/source/i2c.c] [ 164s] [COMPILING libboard/qmod/source/board_qmod.c] [ 164s] [COMPILING apps/dfu/main.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 165s] Memory region Used Size Region Size %age Used [ 165s] rom: 16588 B 16 KB 101.25% [ 165s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 165s] collect2: error: ld returned 1 exit status [ 165s] % [ 165s] make[2]: *** [Makefile:234: flash] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 165s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: error: make -j1 returned exit code 2 [ 165s] make: *** [debian/rules:16: build] Error 25 [ 165s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 165s] ### VM INTERACTION START ### [ 168s] [ 159.189943] sysrq: Power Off [ 168s] [ 159.195699] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] lamb27 failed "build simtrace2_0.7.0.63.39070.dsc" at Wed Sep 9 01:44:24 UTC 2020. [ 168s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Sep 9 07:19:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 07:19:05 +0000 Subject: Change in libosmocore[master]: logging: refactor and simplify log_target_destroy() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20042 ) Change subject: logging: refactor and simplify log_target_destroy() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic6b9906e6fd24de6af9c869348c100d9ef6a7df6 Gerrit-Change-Number: 20042 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 07:19:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 07:19:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 07:19:59 +0000 Subject: Change in libosmocore[master]: logging: fix log_target_destroy(): properly close syslog In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20043 ) Change subject: logging: fix log_target_destroy(): properly close syslog ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I122445e8ee842b5f807d21a272520648660e7e65 Gerrit-Change-Number: 20043 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 07:19:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 07:20:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 07:20:29 +0000 Subject: Change in libosmocore[master]: logging: fix memleak in log_target_create_file() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20044 ) Change subject: logging: fix memleak in log_target_create_file() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If16d8c6417698bbb5cf87716f9507c7256aeaecb Gerrit-Change-Number: 20044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 07:20:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 07:50:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 07:50:47 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Update module param addresses naming to support ipv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20041 ) Change subject: ttcn3-mgw: Update module param addresses naming to support ipv6 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 Gerrit-Change-Number: 20041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 07:50:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 07:51:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 07:51:45 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Avoid sending packets on recvonly connection In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20029 ) Change subject: mgw: osmux: Avoid sending packets on recvonly connection ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87b1fb7d73cbbb2a5d4d8a40a9527a3e05d9947b Gerrit-Change-Number: 20029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 07:51:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 07:52:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 07:52:30 +0000 Subject: Change in osmo-mgw[master]: mgw: Release endpoint after last conn times out In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20030 ) Change subject: mgw: Release endpoint after last conn times out ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f Gerrit-Change-Number: 20030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 07:52:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 07:52:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 07:52:47 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Fix conn watchdog timeout not updated In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20031 ) Change subject: mgw: osmux: Fix conn watchdog timeout not updated ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id592d7db7b9399a497176e0d28cc826b3bce48c0 Gerrit-Change-Number: 20031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 07:52:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:37:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:37:28 +0000 Subject: Change in osmo-mgw[master]: mgw: Release endpoint after last conn times out In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20030 ) Change subject: mgw: Release endpoint after last conn times out ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/20030/1/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/20030/1/src/libosmo-mgcp/mgcp_endp.c at 682 PS1, Line 682: llist_del(&conn->entry); > This is the essence of the patch, maybe a comment makes sense? well the essence of the patch is actually the lines below: release endpoint when it becomes out of connections. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f Gerrit-Change-Number: 20030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 10:37:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:37:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:37:49 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Avoid sending packets on recvonly connection In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20029 ) Change subject: mgw: osmux: Avoid sending packets on recvonly connection ...................................................................... mgw: osmux: Avoid sending packets on recvonly connection Change-Id: I87b1fb7d73cbbb2a5d4d8a40a9527a3e05d9947b --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 17 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 5864c95..02e31bb 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -35,6 +35,7 @@ struct osmux_handle { struct llist_head head; + struct mgcp_conn_rtp *conn; struct osmux_in_handle *in; struct in_addr rem_addr; int rem_port; /* network byte order */ @@ -47,14 +48,17 @@ static void osmux_deliver_cb(struct msgb *batch_msg, void *data) { struct osmux_handle *handle = data; - struct sockaddr_in out = { - .sin_family = AF_INET, - .sin_port = handle->rem_port, - }; + struct mgcp_conn_rtp *conn = handle->conn; - memcpy(&out.sin_addr, &handle->rem_addr, sizeof(handle->rem_addr)); - sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, - (struct sockaddr *)&out, sizeof(out)); + if (conn->end.output_enabled) { + struct sockaddr_in out = { + .sin_family = AF_INET, + .sin_port = handle->rem_port, + }; + memcpy(&out.sin_addr, &handle->rem_addr, sizeof(handle->rem_addr)); + sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, + (struct sockaddr *)&out, sizeof(out)); + } msgb_free(batch_msg); } @@ -109,13 +113,15 @@ /* Allocate free OSMUX handle */ static struct osmux_handle * -osmux_handle_alloc(struct mgcp_config *cfg, struct in_addr *addr, int rem_port) +osmux_handle_alloc(struct mgcp_conn_rtp *conn, struct in_addr *addr, int rem_port) { struct osmux_handle *h; + struct mgcp_config *cfg = conn->conn->endp->cfg; h = talloc_zero(osmux, struct osmux_handle); if (!h) return NULL; + h->conn = conn; h->rem_addr = *addr; h->rem_port = rem_port; h->refcnt++; @@ -148,7 +154,7 @@ /* Lookup existing handle for a specified address, if the handle can not be * found, the function will automatically allocate one */ static struct osmux_in_handle * -osmux_handle_lookup(struct mgcp_config *cfg, struct osmo_sockaddr *addr, int rem_port) +osmux_handle_lookup(struct mgcp_conn_rtp *conn, struct osmo_sockaddr *addr, int rem_port) { struct osmux_handle *h; @@ -161,7 +167,7 @@ if (h != NULL) return h->in; - h = osmux_handle_alloc(cfg, &addr->u.sin.sin_addr, rem_port); + h = osmux_handle_alloc(conn, &addr->u.sin.sin_addr, rem_port); if (h == NULL) return NULL; @@ -474,7 +480,7 @@ return -1; } - conn->osmux.in = osmux_handle_lookup(endp->cfg, addr, port); + conn->osmux.in = osmux_handle_lookup(conn, addr, port); if (!conn->osmux.in) { LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, "Cannot allocate input osmux handle for conn:%s\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87b1fb7d73cbbb2a5d4d8a40a9527a3e05d9947b Gerrit-Change-Number: 20029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:37:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:37:49 +0000 Subject: Change in osmo-mgw[master]: mgw: Release endpoint after last conn times out In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20030 ) Change subject: mgw: Release endpoint after last conn times out ...................................................................... mgw: Release endpoint after last conn times out Otherwise some state is kept, like the previous CallId, which may then provoke issues next time the endpoint is to be used. Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_network.c 4 files changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 14cae25..8d19b44 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -139,3 +139,5 @@ struct mgcp_endpoint *mgcp_endp_by_name(int *cause, const char *epname, struct mgcp_config *cfg); bool mgcp_endp_avail(struct mgcp_endpoint *endp); +void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn); +void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 328e580..6424dcb 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -199,7 +199,7 @@ /* Initialize watchdog */ osmo_timer_setup(&conn->watchdog, mgcp_conn_watchdog_cb, conn); mgcp_conn_watchdog_kick(conn); - llist_add(&conn->entry, &endp->conns); + mgcp_endp_add_conn(endp, conn); return conn; } @@ -289,12 +289,6 @@ if (!conn) return; - /* Run endpoint cleanup action. By this we inform the endpoint about - * the removal of the connection and allow it to clean up its inner - * state accordingly */ - if (endp->type->cleanup_cb) - endp->type->cleanup_cb(endp, conn); - switch (conn->type) { case MGCP_CONN_TYPE_RTP: aggregate_rtp_conn_stats(endp, &conn->u.rtp); @@ -308,7 +302,8 @@ } osmo_timer_del(&conn->watchdog); - llist_del(&conn->entry); + mgcp_endp_remove_conn(endp, conn); + /* WARN: endp may have be freed after call to mgcp_endp_remove_conn */ talloc_free(conn); } diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index c4f3653..ecb2845 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -666,3 +666,20 @@ OSMO_ASSERT(false); } } + +void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn) +{ + llist_add(&conn->entry, &endp->conns); +} + +void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn) +{ + /* Run endpoint cleanup action. By this we inform the endpoint about + * the removal of the connection and allow it to clean up its inner + * state accordingly */ + if (endp->type->cleanup_cb) + endp->type->cleanup_cb(endp, conn); + llist_del(&conn->entry); + if (llist_empty(&endp->conns)) + mgcp_endp_release(endp); +} diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 75a4754..fa40f1f 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1379,7 +1379,8 @@ * connections present when one connection is removed from the * endpoint. */ llist_for_each_entry(conn_cleanup, &endp->conns, entry) { - conn_cleanup->priv = NULL; + if (conn_cleanup->priv == conn) + conn_cleanup->priv = NULL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f Gerrit-Change-Number: 20030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:37:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:37:50 +0000 Subject: Change in osmo-mgw[master]: mgw: osmux: Fix conn watchdog timeout not updated In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20031 ) Change subject: mgw: osmux: Fix conn watchdog timeout not updated ...................................................................... mgw: osmux: Fix conn watchdog timeout not updated It is currently done upon receival of RTP packets in rx_rtp for pure RTP conns, but nothing similar is done for Osmux conns, which eventually trigger a connection time out. Change-Id: Id592d7db7b9399a497176e0d28cc826b3bce48c0 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 02e31bb..9a3c950 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -390,6 +390,8 @@ goto out; } + mgcp_conn_watchdog_kick(conn_src->conn); + /*conn_dst = mgcp_find_dst_conn(conn_src->conn); if (!conn_dst) { LOGP(DLMGCP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id592d7db7b9399a497176e0d28cc826b3bce48c0 Gerrit-Change-Number: 20031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:38:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:38:00 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Update module param addresses naming to support ipv6 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20041 ) Change subject: ttcn3-mgw: Update module param addresses naming to support ipv6 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 Gerrit-Change-Number: 20041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 10:38:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:40:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:40:25 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX In-Reply-To: References: Message-ID: Hello dexter, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 to look at the new patch set (#3). Change subject: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX This is needed to be able to force MGW to provide an IPv4 address during MDCX, since IPACC protocol on the BTS side only supports IPv4, but one may need IPv6 side at the same time on the core side. By moving the IPACC MDCX request to a later step, the BSC gains knowledge of the local address on each side (BTS, MGW), and if they don't match (ie. BTS uses IPv4 and MGW uses IPv6), it can then get MGW to offer an IPv4 address during MGCP MDCX containing the BTS IPv4 address. At that point, the MGW can see the mismatch and provide an IPv4 address in the MGCP MDCX ACK, which can then finally be communicated to the BTS during IPACC MDCX phase. Previous order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK (get MGW local IP addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IP addr) BSC -> BTS: IPACC MDCX (set MGW IP addr) BSC <- BTS: IPACC MDCX ACK BSC -> MGW: MDCX (set BTS IP addr) BSC <- MGW: MDCX ACK New order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK (get MGCP local IPv6 addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IPv4 addr) BSC -> MGW: MDCX (set BTS IPv4 addr) BSC <- MGW: MDCX ACK (here MGW changes its local addr to IPv4) BSC -> BTS: IPACC MDCX (set MGW IPv4 addr) BSC <- BTS: IPACC MDCX ACK Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 --- M doc/lchan-rtp-fsm.dot M doc/lchan.msc M src/osmo-bsc/lchan_rtp_fsm.c 3 files changed, 36 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/19954/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:41:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:41:00 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Sep 2020 10:41:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:41:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:41:06 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19949 ) Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 10:41:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:41:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:41:30 +0000 Subject: Change in osmo-msc[master]: Support sending IPv6 Transport Address in Assignment Command In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19922 ) Change subject: Support sending IPv6 Transport Address in Assignment Command ...................................................................... Support sending IPv6 Transport Address in Assignment Command Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 --- M src/libmsc/ran_msg_a.c 1 file changed, 40 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index 8158e91..c17eb3d 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -977,25 +977,48 @@ /* Package RTP-Address data */ if (osmo_sockaddr_str_is_nonzero(ac->cn_rtp)) { - struct sockaddr_in rtp_addr_in; - - memset(&rtp_addr_in, 0, sizeof(rtp_addr_in)); - rtp_addr_in.sin_family = AF_INET; - rtp_addr_in.sin_port = osmo_htons(ac->cn_rtp->port), - rtp_addr_in.sin_addr.s_addr = inet_addr(ac->cn_rtp->ip); - - if (rtp_addr_in.sin_addr.s_addr == INADDR_NONE) { - LOG_RAN_A_ENC(log_fi, LOGL_ERROR, "Assignment Command: Invalid RTP-Address\n"); + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; + int family = osmo_ip_str_type(ac->cn_rtp->ip); + switch (family) { + case AF_INET: + sin = (struct sockaddr_in *)&rtp_addr; + sin->sin_family = AF_INET; + sin->sin_port = osmo_htons(ac->cn_rtp->port); + if (inet_pton(AF_INET, ac->cn_rtp->ip, &sin->sin_addr) != 1) { + LOG_RAN_A_ENC(log_fi, LOGL_ERROR, + "Assignment Command: Invalid RTP-Address %s\n", + ac->cn_rtp->ip); + return NULL; + } + if (sin->sin_port == 0) { + LOG_RAN_A_ENC(log_fi, LOGL_ERROR, + "Assignment Command: Invalid RTP-Port\n"); + return NULL; + } + break; + case AF_INET6: + sin6 = (struct sockaddr_in6 *)&rtp_addr; + sin6->sin6_family = AF_INET6; + sin6->sin6_port = osmo_htons(ac->cn_rtp->port); + if (inet_pton(AF_INET6, ac->cn_rtp->ip, &sin6->sin6_addr) != 1) { + LOG_RAN_A_ENC(log_fi, LOGL_ERROR, + "Assignment Command: Invalid RTP-Address %s\n", + ac->cn_rtp->ip); + return NULL; + } + if (sin6->sin6_port == 0) { + LOG_RAN_A_ENC(log_fi, LOGL_ERROR, + "Assignment Command: Invalid RTP-Port\n"); + return NULL; + } + break; + default: + LOG_RAN_A_ENC(log_fi, LOGL_ERROR, + "Assignment Command: Invalid RTP-Address type for %s\n", + ac->cn_rtp->ip); return NULL; } - if (rtp_addr_in.sin_port == 0) { - LOG_RAN_A_ENC(log_fi, LOGL_ERROR, "Assignment Command: Invalid RTP-Port\n"); - return NULL; - } - - memset(&rtp_addr, 0, sizeof(rtp_addr)); - memcpy(&rtp_addr, &rtp_addr_in, sizeof(rtp_addr_in)); - use_rtp_addr = &rtp_addr; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 Gerrit-Change-Number: 19922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:41:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:41:31 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19949 ) Change subject: Support handling IPv6 Transport Address in Assignment Complete ...................................................................... Support handling IPv6 Transport Address in Assignment Complete Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe --- M src/libmsc/ran_msg_a.c 1 file changed, 1 insertion(+), 10 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index c17eb3d..c859c22 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -279,7 +279,6 @@ struct tlv_p_entry *ie_codec_list_bss_supported = TLVP_GET(tp, GSM0808_IE_SPEECH_CODEC_LIST); struct tlv_p_entry *ie_osmux_cid = TLVP_GET(tp, GSM0808_IE_OSMO_OSMUX_CID); struct sockaddr_storage rtp_addr; - struct sockaddr_in *rtp_addr_in; struct gsm0808_speech_codec sc; struct gsm0808_speech_codec_list codec_list_bss_supported; int rc; @@ -296,15 +295,7 @@ return -EINVAL; } - rtp_addr_in = (struct sockaddr_in*)&rtp_addr; - - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Assignment Complete: IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - return -EINVAL; - } - - if (osmo_sockaddr_str_from_sockaddr_in(&ran_dec_msg.assignment_complete.remote_rtp, rtp_addr_in)) { + if (osmo_sockaddr_str_from_sockaddr(&ran_dec_msg.assignment_complete.remote_rtp, &rtp_addr)) { LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Assignment Complete: unable to decode remote RTP IP address\n"); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe Gerrit-Change-Number: 19949 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:44:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:44:09 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: Hello dexter, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 to look at the new patch set (#5). Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Support handling IPv6 Transport Address in Handover Request (Ack) Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 --- M src/libmsc/ran_msg_a.c 1 file changed, 14 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/19982/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:49:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:49:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc... In-Reply-To: References: Message-ID: Hello dexter, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 to look at the new patch set (#3). Change subject: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 ...................................................................... bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 63 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/19980/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 Gerrit-Change-Number: 19980 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:52:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:52:11 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19954 ) Change subject: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Re-applyng +2 after fixing typo. https://gerrit.osmocom.org/c/osmo-bsc/+/19954/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/19954/2//COMMIT_MSG at 36 PS2, Line 36: BSC <- MGW: MDCX ACK (here MGW changes its local addr to IPv6 > We are going from IPv6 to IPv4 on the MGW side, but here you say that the MGW chanes to IPv6? [?] Indeed, typo, I'll fix and submit. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 10:52:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 10:52:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 10:52:14 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19954 ) Change subject: lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX ...................................................................... lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX This is needed to be able to force MGW to provide an IPv4 address during MDCX, since IPACC protocol on the BTS side only supports IPv4, but one may need IPv6 side at the same time on the core side. By moving the IPACC MDCX request to a later step, the BSC gains knowledge of the local address on each side (BTS, MGW), and if they don't match (ie. BTS uses IPv4 and MGW uses IPv6), it can then get MGW to offer an IPv4 address during MGCP MDCX containing the BTS IPv4 address. At that point, the MGW can see the mismatch and provide an IPv4 address in the MGCP MDCX ACK, which can then finally be communicated to the BTS during IPACC MDCX phase. Previous order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK (get MGW local IP addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IP addr) BSC -> BTS: IPACC MDCX (set MGW IP addr) BSC <- BTS: IPACC MDCX ACK BSC -> MGW: MDCX (set BTS IP addr) BSC <- MGW: MDCX ACK New order: BSC -> MGW: CRCX BSC <- MGW: CRCX ACK (get MGCP local IPv6 addr) BSC -> BTS: IPACC CRCX BSC <- BTS: IPACC CRCX ACK (get BTS local IPv4 addr) BSC -> MGW: MDCX (set BTS IPv4 addr) BSC <- MGW: MDCX ACK (here MGW changes its local addr to IPv4) BSC -> BTS: IPACC MDCX (set MGW IPv4 addr) BSC <- BTS: IPACC MDCX ACK Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 --- M doc/lchan-rtp-fsm.dot M doc/lchan.msc M src/osmo-bsc/lchan_rtp_fsm.c 3 files changed, 36 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/lchan-rtp-fsm.dot b/doc/lchan-rtp-fsm.dot index d5df643..4c2dd31 100644 --- a/doc/lchan-rtp-fsm.dot +++ b/doc/lchan-rtp-fsm.dot @@ -1,7 +1,7 @@ digraph G { rankdir=TB labelloc=t; label="lchan RTP FSM" - + lchan [label="lchan\nFSM",shape=box3d] lchan2 [label="lchan\nFSM",shape=box3d] ho_as [label="Handover or Assignment FSM",shape=box3d] @@ -23,14 +23,15 @@ lchan -> WAIT_LCHAN_READY [label="LCHAN_RTP_EV_LCHAN_READY",style=dashed] WAIT_LCHAN_READY -> WAIT_IPACC_CRCX_ACK [label="IPACC BTS"] WAIT_LCHAN_READY -> WAIT_READY_TO_SWITCH_RTP - WAIT_IPACC_CRCX_ACK -> WAIT_IPACC_MDCX_ACK - WAIT_IPACC_MDCX_ACK -> WAIT_READY_TO_SWITCH_RTP + WAIT_IPACC_CRCX_ACK -> WAIT_READY_TO_SWITCH_RTP invisible -> ho [label="HO DETECT",style=dashed] ho -> WAIT_READY_TO_SWITCH_RTP [label="LCHAN_RTP_EV_READY_TO_SWITCH",style=dashed] WAIT_READY_TO_SWITCH_RTP -> WAIT_MGW_ENDPOINT_CONFIGURED WAIT_MGW_ENDPOINT_CONFIGURED -> mgwep [label="MDCX",style=dashed] mgwep -> WAIT_MGW_ENDPOINT_CONFIGURED [label="LCHAN_RTP_EV_\nMGW_ENDPOINT_\nCONFIGURED",style=dashed] + WAIT_MGW_ENDPOINT_CONFIGURED -> WAIT_IPACC_MDCX_ACK [label="IPACC BTS"] WAIT_MGW_ENDPOINT_CONFIGURED -> RTP_READY + WAIT_IPACC_MDCX_ACK -> RTP_READY RTP_READY -> lchan2 [label="LCHAN_EV_\nRTP_READY",style=dashed] RTP_READY -> RTP_ESTABLISHED lchan2 -> RTP_ESTABLISHED [label="LCHAN_RTP_EV_\nRELEASE",style=dashed] diff --git a/doc/lchan.msc b/doc/lchan.msc index b0e32d6..9962c77 100644 --- a/doc/lchan.msc +++ b/doc/lchan.msc @@ -68,10 +68,6 @@ ms <= rtp [label="IPACC CRCX"]; ...; ms => rtp [label="IPACC CRCX ACK (BTS RTP port info)"]; - rtp abox rtp [label="LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK"]; - ms <= rtp [label="IPACC MDCX (MGW RTP port info)"]; - ...; - ms => rtp [label="IPACC MDCX ACK"]; --- [label="END ip.access style BTS"]; |||; rtp box rtp [label="lchan_rtp_fsm_switch_rtp()"]; @@ -91,6 +87,12 @@ ...; mgwep rbox mgwep [label="MGCP: MDCX OK"]; rtp <- mgwep [label="LCHAN_RTP_EV_MGW_ENDPOINT_CONFIGURED"]; + --- [label="IF ip.access style BTS"]; + rtp abox rtp [label="LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK"]; + ms <= rtp [label="IPACC MDCX (MGW RTP port info)"]; + ...; + ms => rtp [label="IPACC MDCX ACK"]; + --- [label="END ip.access style BTS"]; rtp abox rtp [label="LCHAN_RTP_ST_READY"]; lchan <- rtp [label="LCHAN_EV_RTP_READY"]; rtp note rtp [label="RTP FSM stays ready for Rollback until final establish event"]; diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 1dd31b1..5de2967 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -301,10 +301,7 @@ switch (event) { case LCHAN_RTP_EV_IPACC_CRCX_ACK: - /* the CRCX ACK parsing has already noted the RTP port information at - * lchan->abis_ip.bound_*, see ipac_parse_rtp(). We'll use that in - * lchan_rtp_fsm_wait_mgw_endpoint_configured_onenter(). */ - lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK); + lchan_rtp_fsm_switch_rtp(fi); return; case LCHAN_RTP_EV_IPACC_CRCX_NACK: @@ -366,21 +363,16 @@ static void lchan_rtp_fsm_wait_ipacc_mdcx_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); switch (event) { case LCHAN_RTP_EV_IPACC_MDCX_ACK: - lchan_rtp_fsm_switch_rtp(fi); + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_READY); return; case LCHAN_RTP_EV_IPACC_MDCX_NACK: lchan_rtp_fail("Received NACK on IPACC MDCX"); return; - case LCHAN_RTP_EV_READY_TO_SWITCH_RTP: - lchan->activate.info.wait_before_switching_rtp = false; - return; - case LCHAN_RTP_EV_RELEASE: case LCHAN_RTP_EV_ROLLBACK: osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, 0); @@ -480,10 +472,15 @@ static void lchan_rtp_fsm_wait_mgw_endpoint_configured(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - switch (event) { + struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); + switch (event) { case LCHAN_RTP_EV_MGW_ENDPOINT_CONFIGURED: - lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_READY); + if (is_ipaccess_bts(lchan->ts->trx->bts)) + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK); + else { + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_READY); + } return; case LCHAN_RTP_EV_MGW_ENDPOINT_ERROR: @@ -652,23 +649,8 @@ | S(LCHAN_RTP_EV_ROLLBACK) , .out_state_mask = 0 - | S(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK) - , - }, - [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { - .name = "WAIT_IPACC_MDCX_ACK", - .onenter = lchan_rtp_fsm_wait_ipacc_mdcx_ack_onenter, - .action = lchan_rtp_fsm_wait_ipacc_mdcx_ack, - .in_event_mask = 0 - | S(LCHAN_RTP_EV_READY_TO_SWITCH_RTP) - | S(LCHAN_RTP_EV_IPACC_MDCX_ACK) - | S(LCHAN_RTP_EV_IPACC_MDCX_NACK) - | S(LCHAN_RTP_EV_RELEASE) - | S(LCHAN_RTP_EV_ROLLBACK) - , - .out_state_mask = 0 | S(LCHAN_RTP_ST_WAIT_READY_TO_SWITCH_RTP) - | S(LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED) + | S(LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED) /*old: LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK*/ , }, [LCHAN_RTP_ST_WAIT_READY_TO_SWITCH_RTP] = { @@ -694,6 +676,22 @@ | S(LCHAN_RTP_EV_ROLLBACK) , .out_state_mask = 0 + | S(LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK) + | S(LCHAN_RTP_ST_READY) + | S(LCHAN_RTP_ST_ROLLBACK) + , + }, + [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { + .name = "WAIT_IPACC_MDCX_ACK", + .onenter = lchan_rtp_fsm_wait_ipacc_mdcx_ack_onenter, + .action = lchan_rtp_fsm_wait_ipacc_mdcx_ack, + .in_event_mask = 0 + | S(LCHAN_RTP_EV_IPACC_MDCX_ACK) + | S(LCHAN_RTP_EV_IPACC_MDCX_NACK) + | S(LCHAN_RTP_EV_RELEASE) + | S(LCHAN_RTP_EV_ROLLBACK) + , + .out_state_mask = 0 | S(LCHAN_RTP_ST_READY) | S(LCHAN_RTP_ST_ROLLBACK) , -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4de5ea5c94c1482c9cb0b6386997a942edc60e32 Gerrit-Change-Number: 19954 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:20:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 11:20:44 +0000 Subject: Change in osmo-msc[master]: tests: Fix VTY results after switch to newer libosmo-mgcp-client References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20046 ) Change subject: tests: Fix VTY results after switch to newer libosmo-mgcp-client ...................................................................... tests: Fix VTY results after switch to newer libosmo-mgcp-client In this case we are fine with simply updating test result because anyway ABI breakage in some libosmo-mgcp-client structs was needed, so new versions of osmo-msc will require new versions of libosmo-mgcp-client. Change-Id: I1fbdb95f71d3b9a2dc88e1ba79892ae16485aa99 --- M TODO-RELEASE M tests/test_nodes.vty 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/20046/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 78a03ff..fdddbc2 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 osmo-msc Mobile Identity Coding OsmoMSC is stricter in rejecting invalid coding of Mobile Identity IEs +libmosmo-mgcp-client needs osmo-mgw.git > 1.7.0 (8667d5169df8d06e10ee3f3104e4cd533d15ac57), ABI break due to struct size in mgcp_conn_peer and mgcp_response diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index d389675..7337cd9 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -72,9 +72,9 @@ neighbor (a|iu) cgi <0-999> <0-999> <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME no neighbor (a|iu) (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME timer [(vlr|mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] - mgw local-ip A.B.C.D + mgw local-ip (A.B.C.D|X:X::X:X) mgw local-port <0-65535> - mgw remote-ip A.B.C.D + mgw remote-ip (A.B.C.D|X:X::X:X) mgw remote-port <0-65535> ... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1fbdb95f71d3b9a2dc88e1ba79892ae16485aa99 Gerrit-Change-Number: 20046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:22:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 11:22:39 +0000 Subject: Change in osmo-bsc[master]: abis_om2000: check result of gsm_bts_trx_set_system_infos() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19965 ) Change subject: abis_om2000: check result of gsm_bts_trx_set_system_infos() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 Gerrit-Change-Number: 19965 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 11:22:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:29:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 11:29:06 +0000 Subject: Change in osmo-bsc[master]: abis_om2000: check result of gsm_bts_trx_set_system_infos() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19965 ) Change subject: abis_om2000: check result of gsm_bts_trx_set_system_infos() ...................................................................... abis_om2000: check result of gsm_bts_trx_set_system_infos() Ensure that osmo-bsc would not continue to work as usual, if for some reason we cannot encode or send System Information messages. Introduce transitional state OM2K_TRX_S_SEND_SI, from where we can generate and send System Information messages. Otherwise it's confusing if we fail to do something when we're already in state OM2K_TRX_S_DONE. Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 19 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 5c8b378..a3f689a 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -2122,6 +2122,7 @@ OM2K_TRX_S_WAIT_TX, OM2K_TRX_S_WAIT_RX, OM2K_TRX_S_WAIT_TS, + OM2K_TRX_S_SEND_SI, OM2K_TRX_S_DONE, OM2K_TRX_S_ERROR }; @@ -2195,14 +2196,22 @@ &ts->rbs2000.om2k_mo); } else { /* only after all 8 TS */ - osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_DONE, 0, 0); + osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_SEND_SI, 0, 0); } } +static void om2k_trx_s_send_si(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct om2k_trx_fsm_priv *otfp = fi->priv; + + if (gsm_bts_trx_set_system_infos(otfp->trx) == 0) + osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_DONE, 0, 0); + else + osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_ERROR, 0, 0); +} + static void om2k_trx_s_done_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - struct om2k_trx_fsm_priv *otfp = fi->priv; - gsm_bts_trx_set_system_infos(otfp->trx); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); } @@ -2237,10 +2246,16 @@ [OM2K_TRX_S_WAIT_TS] = { .in_event_mask = S(OM2K_TRX_EVT_TS_DONE), .out_state_mask = S(OM2K_TRX_S_ERROR) | - S(OM2K_TRX_S_DONE), + S(OM2K_TRX_S_SEND_SI), .name = "WAIT-TS", .action = om2k_trx_s_wait_ts, }, + [OM2K_TRX_S_SEND_SI] = { + .out_state_mask = S(OM2K_TRX_S_ERROR) | + S(OM2K_TRX_S_DONE), + .name = "SEND-SI", + .onenter = om2k_trx_s_send_si, + }, [OM2K_TRX_S_DONE] = { .name = "DONE", .onenter = om2k_trx_s_done_onenter, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia6df539d0914c57ea80fdb29882832678b47f267 Gerrit-Change-Number: 19965 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:30:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 11:30:51 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 24: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 85 PS24, Line 85: /* TODO: implement resource distribution */ > I'll out comment the link selector parameter. [?] If you declare a variable of type "struct osmo_gprs_ns2_prim" in a program an then change the size of the struct in the lib, for sure you are breaking the ABI (well in the case of a union is really depends on whether it's already the option with the biggest size or not, but you get the point). If you add stuff where the TODO is, it's not the latest field in the struct, so again you are breaking the ABI. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 882 PS24, Line 882: static bool gprs_fsm_vc_registered = false; > I don't care. Just took this over from NS1. [?] I think we usually use constructors to register GFSM and all that. No strong opinion though. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_frgre.c at 524 PS24, Line 524: rc = handle_nsfrgre_read(bfd); > Did I missed the free? I didn't check, just pointing it out in case you didn't check or forgot about the possibility :) https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c File src/gb/gprs_ns2_message.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c at 64 PS24, Line 64: int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) > what do you mean? If 0 means success and 1 error, usually we return negative values. Moreover, otherwise why is an int returned and not an unsigned int? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 24 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 11:30:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:33:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 11:33:09 +0000 Subject: Change in osmo-msc[master]: tests: Fix VTY results after switch to newer libosmo-mgcp-client In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20046 ) Change subject: tests: Fix VTY results after switch to newer libosmo-mgcp-client ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1fbdb95f71d3b9a2dc88e1ba79892ae16485aa99 Gerrit-Change-Number: 20046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 09 Sep 2020 11:33:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:34:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 11:34:10 +0000 Subject: Change in libosmocore[master]: logging: refactor and simplify log_target_destroy() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20042 ) Change subject: logging: refactor and simplify log_target_destroy() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic6b9906e6fd24de6af9c869348c100d9ef6a7df6 Gerrit-Change-Number: 20042 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 11:34:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:34:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 11:34:27 +0000 Subject: Change in libosmocore[master]: logging: fix log_target_destroy(): properly close syslog In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20043 ) Change subject: logging: fix log_target_destroy(): properly close syslog ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I122445e8ee842b5f807d21a272520648660e7e65 Gerrit-Change-Number: 20043 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 11:34:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:35:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 11:35:09 +0000 Subject: Change in libosmocore[master]: logging: fix memleak in log_target_create_file() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20044 ) Change subject: logging: fix memleak in log_target_create_file() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If16d8c6417698bbb5cf87716f9507c7256aeaecb Gerrit-Change-Number: 20044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 11:35:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:39:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 11:39:50 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19982/6/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19982/6/src/libmsc/ran_msg_a.c at 613 PS6, Line 613: else if Just to clarify, is it expected that we parse either the AoIP transport address *or* RTP address, but *not both* at the same time? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Sep 2020 11:39:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:40:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 11:40:45 +0000 Subject: Change in libosmocore[master]: logging: refactor and simplify log_target_destroy() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20042 ) Change subject: logging: refactor and simplify log_target_destroy() ...................................................................... logging: refactor and simplify log_target_destroy() Change-Id: Ic6b9906e6fd24de6af9c869348c100d9ef6a7df6 --- M src/logging.c 1 file changed, 8 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/logging.c b/src/logging.c index c14e696..78abc19 100644 --- a/src/logging.c +++ b/src/logging.c @@ -959,16 +959,14 @@ log_del_target(target); #if (!EMBEDDED) - if (target->output == &_file_output) { -/* since C89/C99 says stderr is a macro, we can safely do this! */ -#ifdef stderr - /* don't close stderr */ - if (target->tgt_file.out != stderr) -#endif - { - fclose(target->tgt_file.out); - target->tgt_file.out = NULL; - } + switch (target->type) { + case LOG_TGT_TYPE_FILE: + fclose(target->tgt_file.out); + target->tgt_file.out = NULL; + break; + default: + /* make GCC happy */ + break; } #endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic6b9906e6fd24de6af9c869348c100d9ef6a7df6 Gerrit-Change-Number: 20042 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:40:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 11:40:45 +0000 Subject: Change in libosmocore[master]: logging: fix log_target_destroy(): properly close syslog In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20043 ) Change subject: logging: fix log_target_destroy(): properly close syslog ...................................................................... logging: fix log_target_destroy(): properly close syslog Change-Id: I122445e8ee842b5f807d21a272520648660e7e65 --- M src/logging.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/logging.c b/src/logging.c index 78abc19..80ff72c 100644 --- a/src/logging.c +++ b/src/logging.c @@ -39,6 +39,11 @@ #ifdef HAVE_STRINGS_H #include #endif + +#ifdef HAVE_SYSLOG_H +#include +#endif + #include #include #include @@ -964,6 +969,11 @@ fclose(target->tgt_file.out); target->tgt_file.out = NULL; break; +#ifdef HAVE_SYSLOG_H + case LOG_TGT_TYPE_SYSLOG: + closelog(); + break; +#endif /* HAVE_SYSLOG_H */ default: /* make GCC happy */ break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I122445e8ee842b5f807d21a272520648660e7e65 Gerrit-Change-Number: 20043 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:40:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 11:40:46 +0000 Subject: Change in libosmocore[master]: logging: fix memleak in log_target_create_file() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20044 ) Change subject: logging: fix memleak in log_target_create_file() ...................................................................... logging: fix memleak in log_target_create_file() Change-Id: If16d8c6417698bbb5cf87716f9507c7256aeaecb --- M src/logging.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/logging.c b/src/logging.c index 80ff72c..db04cf7 100644 --- a/src/logging.c +++ b/src/logging.c @@ -915,8 +915,10 @@ target->type = LOG_TGT_TYPE_FILE; target->tgt_file.out = fopen(fname, "a"); - if (!target->tgt_file.out) + if (!target->tgt_file.out) { + log_target_destroy(target); return NULL; + } target->output = _file_output; @@ -966,6 +968,8 @@ #if (!EMBEDDED) switch (target->type) { case LOG_TGT_TYPE_FILE: + if (target->tgt_file.out == NULL) + break; fclose(target->tgt_file.out); target->tgt_file.out = NULL; break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If16d8c6417698bbb5cf87716f9507c7256aeaecb Gerrit-Change-Number: 20044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:42:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:42:06 +0000 Subject: Change in osmo-msc[master]: tests: Fix VTY results after switch to newer libosmo-mgcp-client In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20046 ) Change subject: tests: Fix VTY results after switch to newer libosmo-mgcp-client ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1fbdb95f71d3b9a2dc88e1ba79892ae16485aa99 Gerrit-Change-Number: 20046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:42:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:42:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:42:10 +0000 Subject: Change in osmo-msc[master]: tests: Fix VTY results after switch to newer libosmo-mgcp-client In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20046 ) Change subject: tests: Fix VTY results after switch to newer libosmo-mgcp-client ...................................................................... tests: Fix VTY results after switch to newer libosmo-mgcp-client In this case we are fine with simply updating test result because anyway ABI breakage in some libosmo-mgcp-client structs was needed, so new versions of osmo-msc will require new versions of libosmo-mgcp-client. Change-Id: I1fbdb95f71d3b9a2dc88e1ba79892ae16485aa99 --- M TODO-RELEASE M tests/test_nodes.vty 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 78a03ff..fdddbc2 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 osmo-msc Mobile Identity Coding OsmoMSC is stricter in rejecting invalid coding of Mobile Identity IEs +libmosmo-mgcp-client needs osmo-mgw.git > 1.7.0 (8667d5169df8d06e10ee3f3104e4cd533d15ac57), ABI break due to struct size in mgcp_conn_peer and mgcp_response diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index d389675..7337cd9 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -72,9 +72,9 @@ neighbor (a|iu) cgi <0-999> <0-999> <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME no neighbor (a|iu) (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME timer [(vlr|mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] - mgw local-ip A.B.C.D + mgw local-ip (A.B.C.D|X:X::X:X) mgw local-port <0-65535> - mgw remote-ip A.B.C.D + mgw remote-ip (A.B.C.D|X:X::X:X) mgw remote-port <0-65535> ... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1fbdb95f71d3b9a2dc88e1ba79892ae16485aa99 Gerrit-Change-Number: 20046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:43:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:43:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 ) Change subject: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 Gerrit-Change-Number: 19980 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:43:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:43:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:43:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 ) Change subject: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:43:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:43:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:43:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RTP_Emulation: Close previous socket after rebind In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#3) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 ) Change subject: library/RTP_Emulation: Close previous socket after rebind ...................................................................... library/RTP_Emulation: Close previous socket after rebind If test calls RTPEM_bind twice, the previous socket is kept open (ConnId 1) while the new one is assigned to the the expected ConnId for RTP/RTCP packets received (ConnId), however, if remote was already sending packets, it may happen that the port still receives those with ConnId=1, which may make test fail with message: "Received unexpected type from RTP" Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d --- M library/OSMUX_Emulation.ttcn M library/RTP_Emulation.ttcn 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/20032/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d Gerrit-Change-Number: 20032 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:44:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:44:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RTP_Emulation: Close previous socket after rebind In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 ) Change subject: library/RTP_Emulation: Close previous socket after rebind ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d Gerrit-Change-Number: 20032 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:44:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:44:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:44:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 ) Change subject: bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 ...................................................................... bsc: Introduce test TC_assignment_aoip_tla_v6 and TC_ho_into_this_bsc_tla_v6 Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 63 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f16fab4..d32f202 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1397,12 +1397,12 @@ } /* generate an assignment request for either AoIP or SCCPlite */ -function f_gen_ass_req(boolean osmux_enabled := false, integer bssap_idx := 0) return PDU_BSSAP { +function f_gen_ass_req(boolean osmux_enabled := false, integer bssap_idx := 0, charstring aoip_tla := "1.2.3.4") return PDU_BSSAP { var PDU_BSSAP ass_cmd; var BSSMAP_IE_Osmo_OsmuxCID osmux_cid := valueof(ts_OsmuxCID(0)); if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { var BSSMAP_IE_AoIP_TransportLayerAddress tla := - valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + valueof(f_ts_BSSMAP_IE_AoIP_TLA(aoip_tla, 2342)); if (osmux_enabled) { ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla, osmux_cid)); } else { @@ -1415,11 +1415,11 @@ return ass_cmd; } -function f_gen_handover_req(integer bssap_idx := 0) return PDU_BSSAP { +function f_gen_handover_req(integer bssap_idx := 0, charstring aoip_tla := "1.2.3.4") return PDU_BSSAP { var PDU_BSSAP ho_req; if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { var BSSMAP_IE_AoIP_TransportLayerAddress tla := - valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + valueof(f_ts_BSSMAP_IE_AoIP_TLA(aoip_tla, 2342)); ho_req := valueof(ts_BSSMAP_HandoverRequest(omit, tla)); } else { var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1)); @@ -3093,6 +3093,25 @@ vc_conn.done; } +/* establish initial channel, enable ciphering followed by assignment to ciphered channel */ +private function f_tc_assignment_aoip_tla_v6(charstring id) runs on MSC_ConnHdlr { + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(aoip_tla := "::3"); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + + f_establish_fully(ass_cmd, exp_compl); +} +testcase TC_assignment_aoip_tla_v6() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_aoip_tla_v6), pars); + vc_conn.done; +} + /* establish initial channel, enable ciphering followed by assignment to ciphered channel */ private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { @@ -4628,7 +4647,7 @@ activate(as_Media()); BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, - f_gen_handover_req())); + f_gen_handover_req(aoip_tla := g_pars.host_aoip_tla))); BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -4675,9 +4694,8 @@ BSSAP.receive(tr_BSSMAP_HandoverComplete); setverdict(pass); } -testcase TC_ho_into_this_bsc() runs on test_CT { +function f_tc_ho_into_this_bsc_main(TestHdlrParams pars) runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := f_gen_test_hdlr_pars(); f_init(1, true); f_sleep(1.0); @@ -4697,6 +4715,17 @@ f_ctrs_bsc_and_bts_verify(); } +testcase TC_ho_into_this_bsc() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + f_tc_ho_into_this_bsc_main(pars); +} + +testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + pars.host_aoip_tla := "::6"; + f_tc_ho_into_this_bsc_main(pars); +} + private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr { var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); f_rslem_register(0, new_chan_nr); @@ -7390,6 +7419,9 @@ execute( TC_assignment_csd() ); execute( TC_assignment_ctm() ); execute( TC_assignment_sign() ); + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { + execute( TC_assignment_aoip_tla_v6() ); + } execute( TC_assignment_fr_a5_0() ); execute( TC_assignment_fr_a5_1() ); if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { @@ -7498,6 +7530,9 @@ execute( TC_ho_out_fail_no_result_after_ho_cmd() ); execute( TC_ho_into_this_bsc() ); + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { + execute( TC_ho_into_this_bsc_tla_v6() ); + } execute( TC_ho_in_fail_msc_clears() ); execute( TC_ho_in_fail_msc_clears_after_ho_detect() ); execute( TC_ho_in_fail_no_detect() ); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index bf96eff..76a56fc 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -279,6 +279,7 @@ var MgcpOsmuxCID osmux_cid; var SDP_Message sdp; var integer cid := f_get_free_mgcp_conn(); + var charstring local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */ if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) { if (cid != 0) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX"); @@ -292,9 +293,14 @@ sdp := mgcp_cmd.sdp; 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; + if (sdp.connection.addr_type == "IP6") { + local_rtp_addr := host_mgw_rtp_v6; + } else { + local_rtp_addr := host_mgw_rtp_v4; + } } var MgcpConnState mgcp_conn := g_media.mgcp_conn[cid]; - sdp := valueof(ts_SDP(mgcp_conn.mgw.host, mgcp_conn.mgw.host, "foo", "21", + sdp := valueof(ts_SDP(mgcp_conn.mgw.host, local_rtp_addr, "foo", "21", mgcp_conn.mgw.port_nr, { int2str(mgcp_conn.rtp_pt) }, {valueof(ts_SDP_rtpmap(mgcp_conn.rtp_pt, mgcp_conn.mime_type & "/" & @@ -316,15 +322,21 @@ runs on MSC_ConnHdlr return template MgcpResponse { var SDP_Message sdp; var integer cid := f_get_mgcp_conn(f_MgcpCmd_extract_conn_id(mgcp_cmd)); + var charstring local_rtp_addr; if (isvalue(mgcp_cmd.sdp)) { sdp := mgcp_cmd.sdp; 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; + if (sdp.connection.addr_type == "IP6") { + local_rtp_addr := host_mgw_rtp_v6; + } else { + local_rtp_addr := host_mgw_rtp_v4; + } } else { 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", + sdp := valueof(ts_SDP(mgcp_conn.peer.host, local_rtp_addr, "foo", "21", mgcp_conn.peer.port_nr, { int2str(mgcp_conn.rtp_pt) }, {valueof(ts_SDP_rtpmap(mgcp_conn.rtp_pt, mgcp_conn.mime_type & "/" & @@ -427,7 +439,9 @@ var TestHdlrParams g_pars; var charstring host_bts := "127.0.0.2"; - var charstring host_mgw := "127.0.0.3"; + var charstring host_mgw_mgcp := "127.0.0.3"; + var charstring host_mgw_rtp_v4 := "127.0.0.5"; + var charstring host_mgw_rtp_v6 := "::1"; var charstring host_msc := "127.0.0.4"; var boolean g_vty_initialized := false; @@ -538,6 +552,7 @@ boolean exp_ms_power_params, boolean aoip, boolean use_osmux, + charstring host_aoip_tla, TestHdlrParamsMSCPool mscpool }; @@ -567,6 +582,7 @@ exp_ms_power_params := false, aoip := true, use_osmux := false, + host_aoip_tla := "1.2.3.4", mscpool := { bssap_idx := 0, rsl_idx := 0, @@ -1015,7 +1031,7 @@ codecType := FR_AMR; } - f_MscConnHdlr_init(g_pars.media_nr, host_bts, host_mgw, codecType); + f_MscConnHdlr_init(g_pars.media_nr, host_bts, host_mgw_mgcp, codecType); /* patch in the LCLS related items, as needed */ f_ass_patch_lcls(ass_tpl, exp_ass_cpl); @@ -1184,7 +1200,7 @@ cmd := ts_CRCX(get_next_trans_id(), ep, "sendrecv", call_id); resp := tr_CRCX_ACK; } - cmd.sdp := ts_SDP(host_msc, host_mgw, "23", "42", + cmd.sdp := ts_SDP(host_msc, host_mgw_rtp_v4, "23", "42", 14000, { int2str(g_media.mgcp_conn[1].rtp_pt) }, { valueof(ts_SDP_ptime(20)) }); mgcp_transceive_mgw(cmd, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba24fae66c80b64bf81bbfd616294af757e5dca3 Gerrit-Change-Number: 19980 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:44:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:44:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 ) Change subject: msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 ...................................................................... msc: Introduce tests to verify BSSAP and MGCP handling with IPv6 It tests IPv6 Transport Address are passed correctly through BSSAP, and forwards handles them correctly as an MGCP client too. Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 91 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index b24cb8d..24a56b2 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -108,6 +108,7 @@ boolean use_umts_aka, boolean ran_is_geran, boolean use_osmux, + boolean use_ipv6, boolean verify_cell_id }; @@ -932,7 +933,7 @@ if (g_pars.ran_is_geran) { var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass := - tr_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_conn_1.mgw_rtp_ip), ?); + f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?); interleave { /* Second MGCP CRCX (this time for MSS/CN side) */ @@ -954,8 +955,7 @@ var BSSMAP_IE_SpeechCodec codec; var BSSMAP_IE_Osmo_OsmuxCID osmuxCID; log("f_mt_call_complete 6"); - - tla := valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.bss_rtp_ip), cpars.bss_rtp_port)); + tla := f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port); codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR})); if (cpars.use_osmux) { @@ -1325,7 +1325,7 @@ } var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass := - tr_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_conn_1.mgw_rtp_ip), ?); + f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?); var default mdcx := activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_port)); var boolean got_mncc_setup_compl_ind := false; @@ -1378,7 +1378,7 @@ mtc.stop; } - tla := valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.bss_rtp_ip), cpars.bss_rtp_port)); + tla := valueof(f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port)); codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR})); if (cpars.use_osmux) { if (not ispresent(bssap.pdu.bssmap.assignmentRequest.osmuxCID)) { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2a9b23a..6cb852a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -408,6 +408,7 @@ use_umts_aka := false, ran_is_geran := ran_is_geran, use_osmux := use_osmux, + use_ipv6 := false, verify_cell_id := mp_enable_cell_id_test and verify_cell_id }; if (not ran_is_geran) { @@ -767,6 +768,22 @@ vc_conn := f_start_handler(refers(f_tc_lu_and_mo_call), 7); vc_conn.done; } +friend function f_tc_lu_and_mo_call_ipv6(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams); + cpars.mgw_conn_1.mgw_rtp_ip := "::1"; + cpars.mgw_conn_2.mgw_rtp_ip := "::2"; + cpars.bss_rtp_ip := "::3"; + f_perform_lu(); + f_mo_call(cpars); +} +testcase TC_lu_and_mo_call_ipv6() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_mo_call_ipv6), 7); + vc_conn.done; +} /* Verify T(iar) triggers and releases the channel */ friend function f_lu_and_mo_call_sccp_tiar_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -1960,6 +1977,24 @@ vc_conn.done; } +/* LU followed by MT call (including paging) */ +friend function f_tc_lu_and_mt_call_ipv6(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); + cpars.mgw_conn_1.mgw_rtp_ip := "::1"; + cpars.mgw_conn_2.mgw_rtp_ip := "::2"; + cpars.bss_rtp_ip := "::3"; + f_perform_lu(); + f_mt_call(cpars); +} +testcase TC_lu_and_mt_call_ipv6() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_mt_call_ipv6), 39); + vc_conn.done; +} + /* MT call while already Paging */ friend function f_tc_lu_and_mt_call_already_paging(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var CallParameters cpars := valueof(t_CallParams('123456'H, 0)); @@ -5492,7 +5527,14 @@ } private function f_tc_ho_inter_bsc0(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); + var CallParameters cpars; + + cpars := valueof(t_CallParams('12345'H, 0)); + if (pars.use_ipv6) { + cpars.mgw_conn_1.mgw_rtp_ip := "::1"; + cpars.mgw_conn_2.mgw_rtp_ip := "::2"; + cpars.bss_rtp_ip := "::3"; + } f_init_handler(pars); @@ -5547,7 +5589,8 @@ /* new BSS composes a RR Handover Command */ var PDU_ML3_NW_MS rr_ho_cmd := valueof(ts_RR_HandoverCommand); var octetstring rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + var BSSMAP_IE_AoIP_TransportLayerAddress tla tla := + valueof(f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port)); BSSAP.send(ts_BSSMAP_HandoverRequestAcknowledge(rr_ho_cmd_enc, lengthof(rr_ho_cmd_enc), tla, ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}))); @@ -5579,6 +5622,12 @@ setverdict(pass); } private function f_tc_ho_inter_bsc1(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + var charstring bss_rtp_ip; + if (pars.use_ipv6) { + bss_rtp_ip := "::8"; + } else { + bss_rtp_ip := "1.2.3.4"; + } f_init_handler(pars); f_create_bssmap_exp_handoverRequest(194); @@ -5588,7 +5637,8 @@ /* new BSS composes a RR Handover Command */ var PDU_ML3_NW_MS rr_ho_cmd := valueof(ts_RR_HandoverCommand); var octetstring rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + var BSSMAP_IE_AoIP_TransportLayerAddress tla := + valueof(f_ts_BSSMAP_IE_AoIP_TLA(bss_rtp_ip, 2342)); BSSAP.send(ts_BSSMAP_HandoverRequestAcknowledge(rr_ho_cmd_enc, lengthof(rr_ho_cmd_enc), tla, ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}))); @@ -5630,19 +5680,27 @@ f_expect_clear(); setverdict(pass); } -testcase TC_ho_inter_bsc() runs on MTC_CT { +function f_tc_ho_inter_bsc_main(boolean use_ipv6 := false) runs on MTC_CT { var BSC_ConnHdlr vc_conn0; var BSC_ConnHdlr vc_conn1; f_init(2); var BSC_ConnHdlrPars pars0 := f_init_pars(53); + pars0.use_ipv6 := use_ipv6; var BSC_ConnHdlrPars pars1 := f_init_pars(53); + pars1.use_ipv6 := use_ipv6; vc_conn0 := f_start_handler_with_pars(refers(f_tc_ho_inter_bsc0), pars0, 0); vc_conn1 := f_start_handler_with_pars(refers(f_tc_ho_inter_bsc1), pars1, 1); vc_conn0.done; vc_conn1.done; } +testcase TC_ho_inter_bsc() runs on MTC_CT { + f_tc_ho_inter_bsc_main(false); +} +testcase TC_ho_inter_bsc_ipv6() runs on MTC_CT { + f_tc_ho_inter_bsc_main(true); +} function f_ML3_patch_seq_nr_MS_NW(in uint2_t seq_nr, inout octetstring enc_l3) { log("MS_NW patching N(SD)=", seq_nr, " into dtap ", enc_l3); @@ -5651,7 +5709,14 @@ } private function f_tc_ho_inter_msc_out(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); + var CallParameters cpars; + + cpars := valueof(t_CallParams('12345'H, 0)); + if (pars.use_ipv6) { + cpars.mgw_conn_1.mgw_rtp_ip := "::1"; + cpars.mgw_conn_2.mgw_rtp_ip := "::2"; + cpars.bss_rtp_ip := "::3"; + } var hexstring ho_number := f_gen_msisdn(99999); f_init_handler(pars); @@ -5841,7 +5906,8 @@ /* new BSS composes a RR Handover Command */ rr_ho_cmd := valueof(ts_RR_HandoverCommand); rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + var BSSMAP_IE_AoIP_TransportLayerAddress tla := + valueof(f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port)); BSSAP.send(ts_BSSMAP_HandoverRequestAcknowledge(rr_ho_cmd_enc, lengthof(rr_ho_cmd_enc), tla, ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}))); @@ -5889,6 +5955,16 @@ vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars, 0); vc_conn.done; } +testcase TC_ho_inter_msc_out_ipv6() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(1); + + var BSC_ConnHdlrPars pars := f_init_pars(54); + pars.use_ipv6 := true; + + vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars, 0); + vc_conn.done; +} private function f_tc_lu_imsi_auth_tmsi_check_imei(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { pars.net.expect_auth := true; @@ -6242,6 +6318,7 @@ execute( TC_cmserv_imsi_unknown() ); execute( TC_cmserv_tmsi_unknown() ); execute( TC_lu_and_mo_call() ); + execute( TC_lu_and_mo_call_ipv6() ); execute( TC_lu_and_mo_call_sccp_tiar_timeout() ); execute( TC_lu_auth_sai_timeout() ); execute( TC_lu_auth_sai_err() ); @@ -6282,6 +6359,7 @@ execute( TC_reset_two() ); execute( TC_lu_and_mt_call() ); + execute( TC_lu_and_mt_call_ipv6() ); execute( TC_lu_and_mt_call_already_paging() ); execute( TC_lu_and_mo_sms() ); @@ -6348,8 +6426,10 @@ execute( TC_ho_inter_bsc_unknown_cell() ); execute( TC_ho_inter_bsc() ); + execute( TC_ho_inter_bsc_ipv6() ); execute( TC_ho_inter_msc_out() ); + execute( TC_ho_inter_msc_out_ipv6() ); execute( TC_lu_imsi_auth_tmsi_check_imei() ); execute( TC_lu_imsi_auth3g_tmsi_check_imei() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id616926dd4a9febc4268eea2ee1e377b2d22753a Gerrit-Change-Number: 19974 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:44:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:44:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RTP_Emulation: Close previous socket after rebind In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 ) Change subject: library/RTP_Emulation: Close previous socket after rebind ...................................................................... library/RTP_Emulation: Close previous socket after rebind If test calls RTPEM_bind twice, the previous socket is kept open (ConnId 1) while the new one is assigned to the the expected ConnId for RTP/RTCP packets received (ConnId), however, if remote was already sending packets, it may happen that the port still receives those with ConnId=1, which may make test fail with message: "Received unexpected type from RTP" Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d --- M library/OSMUX_Emulation.ttcn M library/RTP_Emulation.ttcn 2 files changed, 16 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn index e1275b9..d31a562 100644 --- a/library/OSMUX_Emulation.ttcn +++ b/library/OSMUX_Emulation.ttcn @@ -451,6 +451,11 @@ [] CTRL.getcall(OsmuxEM_bind:{?,?}) -> param(g_local_host, g_local_port) { g_tx_connected := false; /* will set it back to true upon next connect() call */ + + if (g_osmux_conn_id != -1) { + res := OSMUX_CodecPort_CtrlFunct.f_IPL4_close(OSMUX, g_osmux_conn_id, {udp := {}}); + g_osmux_conn_id := -1; + } res := OSMUX_CodecPort_CtrlFunct.f_IPL4_listen(OSMUX, g_local_host, g_local_port, {udp:={}}); if (not ispresent(res.connId)) { diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index 70604dc..900a196 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -4,7 +4,7 @@ * * act as a RTP source that generates a RTP Stream * * act asaa RTP sink that consumes a RTP Stream * - * for all of the above, we want to be able to + * for all of the above, we want to be able to * * specify the payload type * * specify the interval / sample rate * * create drop-outs in the stream @@ -387,6 +387,11 @@ } g_tx_connected := false; /* will set it back to true upon next connect() call */ + + if (g_rtp_conn_id != -1) { + res := RTP_CodecPort_CtrlFunct.f_IPL4_close(RTP, g_rtp_conn_id, {udp := {}}); + g_rtp_conn_id := -1; + } res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTP, g_local_host, g_local_port, {udp:={}}); if (not ispresent(res.connId)) { @@ -395,6 +400,11 @@ } g_rtp_conn_id := res.connId; tr_rtp.connId := g_rtp_conn_id; + + if (g_rtcp_conn_id != -1) { + res := RTP_CodecPort_CtrlFunct.f_IPL4_close(RTCP, g_rtcp_conn_id, {udp := {}}); + g_rtcp_conn_id := -1; + } res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTCP, g_local_host, g_local_port+1, {udp:={}}); if (not ispresent(res.connId)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d Gerrit-Change-Number: 20032 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:44:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:44:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_o... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 ) Change subject: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_osmux() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3abd80b1c0053004aab3d03e09fada1129a59765 Gerrit-Change-Number: 20033 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:45:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:45:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I653eb75439321f9a488dc56dca5d3fc5a8811547 Gerrit-Change-Number: 20034 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:45:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:45:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:45:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c4e497e522fc17e5cfe76987f802265c486ab Gerrit-Change-Number: 20035 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:45:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:45:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 ) Change subject: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3452cecf7fb281e5e46471f7f53983c08c6bfdf Gerrit-Change-Number: 20036 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:46:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:46:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Rename IP address module parameter specifying IP version In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 ) Change subject: mgw: Rename IP address module parameter specifying IP version ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 Gerrit-Change-Number: 20037 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:46:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:46:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:46:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 addresses in MGCP messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 ) Change subject: mgw: Test IPv6 addresses in MGCP messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib134dda5a8f7c8f50968b6ce330f9986ae72575d Gerrit-Change-Number: 20038 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:46:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:46:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:46:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 RTP streams in osmo-mgw In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 ) Change subject: mgw: Test IPv6 RTP streams in osmo-mgw ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 Gerrit-Change-Number: 20039 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:46:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:48:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:48:14 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Patch Set 1: > My proposal: Do a patch release for osmo-bts on top of latest release with the osmo-bts patch fixing the test so this way last release still works with both new and old libosmocore. Agree? ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 11:48:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:48:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 9 Sep 2020 11:48:59 +0000 Subject: Change in osmo-msc[master]: Don't Store an SMS in the database when the ESME is not Bound In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19935 ) Change subject: Don't Store an SMS in the database when the ESME is not Bound ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Gerrit-Change-Number: 19935 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Sep 2020 11:48:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:50:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 11:50:15 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 11:50:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 11:51:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 11:51:26 +0000 Subject: Change in osmo-msc[master]: Support handling IPv6 Transport Address in Handover Request (Ack) In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (Ack) ...................................................................... Support handling IPv6 Transport Address in Handover Request (Ack) Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 --- M src/libmsc/ran_msg_a.c 1 file changed, 14 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index c859c22..6a33704 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -607,23 +607,13 @@ } if (ie_aoip_transp_addr) { - do { - struct sockaddr_storage rtp_addr; - if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); - break; - } - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - break; - } - if (osmo_sockaddr_str_from_sockaddr_in(&rtp_ran_local, (struct sockaddr_in*)&rtp_addr)) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); - break; - } + struct sockaddr_storage rtp_addr; + if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); + else if (osmo_sockaddr_str_from_sockaddr(&rtp_ran_local, &rtp_addr) < 0) + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); + else r->rtp_ran_local = &rtp_ran_local; - } while(0); } if (ie_codec_list_msc_preferred @@ -689,24 +679,14 @@ } if (ie_aoip_transp_addr) { - do { - struct sockaddr_storage rtp_addr; - if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); - break; - } - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - break; - } - if (osmo_sockaddr_str_from_sockaddr_in(&ran_dec_msg.handover_request_ack.remote_rtp, - (struct sockaddr_in*)&rtp_addr)) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); - ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){}; - break; - } - } while(0); + struct sockaddr_storage rtp_addr; + if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); + } else if (osmo_sockaddr_str_from_sockaddr(&ran_dec_msg.handover_request_ack.remote_rtp, + &rtp_addr)) { + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); + ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){}; + } } if (ie_speech_codec) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:01:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 12:01:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_o... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 ) Change subject: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_osmux() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3abd80b1c0053004aab3d03e09fada1129a59765 Gerrit-Change-Number: 20033 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 12:01:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:03:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 12:03:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I653eb75439321f9a488dc56dca5d3fc5a8811547 Gerrit-Change-Number: 20034 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 12:03:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:03:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 12:03:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c4e497e522fc17e5cfe76987f802265c486ab Gerrit-Change-Number: 20035 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 12:03:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:04:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 12:04:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 ) Change subject: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3452cecf7fb281e5e46471f7f53983c08c6bfdf Gerrit-Change-Number: 20036 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 12:04:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:07:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 12:07:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Rename IP address module parameter specifying IP version In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 ) Change subject: mgw: Rename IP address module parameter specifying IP version ...................................................................... Patch Set 2: docker-playground/ttcn3-mgw-test/MGCP_Test.cfg is still using the old name, is there a patch renaming it somewhere? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 Gerrit-Change-Number: 20037 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Sep 2020 12:07:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:10:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 12:10:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 addresses in MGCP messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 ) Change subject: mgw: Test IPv6 addresses in MGCP messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib134dda5a8f7c8f50968b6ce330f9986ae72575d Gerrit-Change-Number: 20038 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 12:10:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:22:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 12:22:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Rename IP address module parameter specifying IP version In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 ) Change subject: mgw: Rename IP address module parameter specifying IP version ...................................................................... Patch Set 2: https://gerrit.osmocom.org/c/docker-playground/+/20041 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 Gerrit-Change-Number: 20037 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Sep 2020 12:22:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:22:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 12:22:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I653eb75439321f9a488dc56dca5d3fc5a8811547 Gerrit-Change-Number: 20034 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 12:22:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:22:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 12:22:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c4e497e522fc17e5cfe76987f802265c486ab Gerrit-Change-Number: 20035 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 12:22:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:22:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 12:22:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_o... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 ) Change subject: mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_osmux() ...................................................................... mgw: Allow setting udp ip/port with wildcard osmux in f_flow_create_osmux() This will be needed once IPv4+IPv6 support is used, since we want to set the remote IP addr in CRCX for convinience to get an IP adr from ther same family during CRCX, while still allowing for testing Osmux CID wildcard value. Change-Id: I3abd80b1c0053004aab3d03e09fada1129a59765 --- M mgw/MGCP_Test.ttcn 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 24bfdaf..deb9f3e 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -417,10 +417,13 @@ * part that tells the MGW where we are listening for Osmux streams * that come from the MGW. We get a fully working connection in * one go. */ - rx_hdl := c_OsmuxemDefaultRxHandle; - rx_hdl.cid := flow.osmux_cid; - f_osmuxem_register_rxhandle(pt, rx_hdl); - flow.osmux_cid_sent := true; + if (flow.osmux_cid != -1) { + /* We may still want to negotiate osmux CID later at MDCX */ + rx_hdl := c_OsmuxemDefaultRxHandle; + rx_hdl.cid := flow.osmux_cid; + f_osmuxem_register_rxhandle(pt, rx_hdl); + flow.osmux_cid_sent := true; + } cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux_cid); cmd.sdp := ts_SDP(flow.em.hostname, flow.em.hostname, "23", "42", flow.em.portnr, { int2str(flow.pt) }, attributes); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3abd80b1c0053004aab3d03e09fada1129a59765 Gerrit-Change-Number: 20033 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:22:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 12:22:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp ...................................................................... mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp rtpem should be set to BIDIR at the same time where MDCX "sendrecv" is sent, otherwise if MGW sends us RTP packets (because we set the conn to sendrecv) they will be counted incorrectly in stats[0].num_pkts_rx_err_disabled. This issue doesn't trigger in current code because the MGW doesn't know anyway the remote IP address of the other connection until an MDCX is sent to it. However, if for whatever reason the IP address is known (for instance because it is set during CRCX, which will be done in next commits), then RTP messages would be sent and the error counter would be > 0. Change-Id: I653eb75439321f9a488dc56dca5d3fc5a8811547 --- M mgw/MGCP_Test.ttcn 1 file changed, 13 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index deb9f3e..429d337 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1754,12 +1754,12 @@ f_sleep(0.5); stats[0] := f_rtpem_stats_get(RTPEM[0]); if (stats[0].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 0"); mtc.stop; } stats[1] := f_rtpem_stats_get(RTPEM[1]); if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 1"); mtc.stop; } @@ -1768,40 +1768,39 @@ f_sleep(1.0); stats[0] := f_rtpem_stats_get(RTPEM[0]); if (stats[0].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 0"); mtc.stop; } stats[1] := f_rtpem_stats_get(RTPEM[1]); if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 1"); mtc.stop; } /* The first leg will now be switched into bidirectional * mode, but we do not expect any data comming back yet. */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + num_pkts_tx[1] := stats[1].num_pkts_tx; f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); f_sleep(0.5); stats[0] := f_rtpem_stats_get(RTPEM[0]); - if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); mtc.stop; } stats[1] := f_rtpem_stats_get(RTPEM[1]); if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection"); + setverdict(fail, "received packets from MGW on recvonly connection 1"); mtc.stop; } /* When the second leg is switched into bidirectional mode * as well, then the MGW will connect the two together and * we should see RTP streams passing through from both ends. */ - f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); stats[0] := f_rtpem_stats_get(RTPEM[0]); - num_pkts_tx[0] := stats[0].num_pkts_tx - stats[1] := f_rtpem_stats_get(RTPEM[1]); - num_pkts_tx[1] := stats[1].num_pkts_tx - + num_pkts_tx[0] := stats[0].num_pkts_tx; f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); f_sleep(2.0); @@ -1810,13 +1809,13 @@ temp := stats[0].num_pkts_tx - num_pkts_tx[0] - stats[1].num_pkts_rx; if (temp > 3 or temp < -3) { - setverdict(fail, "number of packets not within normal parameters"); + setverdict(fail, "number of packets not within normal parameters:", temp); mtc.stop; } temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx; if (temp > 3 or temp < -3) { - setverdict(fail, "number of packets not within normal parameters"); + setverdict(fail, "number of packets not within normal parameters:", temp); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I653eb75439321f9a488dc56dca5d3fc5a8811547 Gerrit-Change-Number: 20034 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:22:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 12:22:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 ) Change subject: mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux ...................................................................... mgw: Fix logic in test TC_two_crcx_mdcx_and_rtp_osmux rtpem should be set to BIDIR at the same time where MDCX "sendrecv" is sent, otherwise if MGW sends us RTP packets (because we set the conn to sendrecv) they will be counted incorrectly in stats[0].num_pkts_rx_err_disabled. This issue doesn't trigger in current code because the MGW doesn't know anyway the remote IP address of the other connection until an MDCX is sent to it. However, if for whatever reason the IP address is known (for instance because it is set during CRCX, which will be done in next commits), then RTP messages would be sent and the error counter would be > 0. Change-Id: I8f2c4e497e522fc17e5cfe76987f802265c486ab --- M mgw/MGCP_Test.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 429d337..c6fe15b 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1331,6 +1331,9 @@ /* The first leg will now be switched into bidirectional * mode, but we do not expect any data comming back yet. */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + stats_osmux := f_osmuxem_stats_get(OsmuxEM); + num_pkts_tx[1] := stats_osmux.num_pkts_tx; f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); f_sleep(0.5); stats_rtp := f_rtpem_stats_get(RTPEM[0]); @@ -1347,12 +1350,9 @@ /* When the second leg is switched into bidirectional mode * as well, then the MGW will connect the two together and * we should see RTP streams passing through from both ends. */ - f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); f_osmuxem_mode(OsmuxEM, OSMUXEM_MODE_BIDIR); stats_rtp := f_rtpem_stats_get(RTPEM[0]); - num_pkts_tx[0] := stats_rtp.num_pkts_tx - stats_osmux := f_osmuxem_stats_get(OsmuxEM); - num_pkts_tx[1] := stats_osmux.num_pkts_tx + num_pkts_tx[0] := stats_rtp.num_pkts_tx; if (crcx_osmux_wildcard) { /* For now we must set same CID as the MGW recvCID, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c4e497e522fc17e5cfe76987f802265c486ab Gerrit-Change-Number: 20035 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:22:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 12:22:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 ) Change subject: mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp ...................................................................... mgw: Fix using incorrect IP version in TC_one_crcx_receive_only_rtp Send the remote address to MGW so it knows which IP version to return during CRCX ACK. This actually better suits the test, since there's less point in checking whether we receive something if we never pass the IP/port to MGW. In any case, the "recvonly" should still tell MGW to refrain from sending stuff to us, so we are really testing that here. Change-Id: Id3452cecf7fb281e5e46471f7f53983c08c6bfdf --- M mgw/MGCP_Test.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index c6fe15b..47a7690 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1593,7 +1593,7 @@ f_init(ep); flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1")); flow.em.portnr := 10000; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow, false); + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow, true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3452cecf7fb281e5e46471f7f53983c08c6bfdf Gerrit-Change-Number: 20036 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 12:24:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 12:24:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Rename IP address module parameter specifying IP version In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 ) Change subject: mgw: Rename IP address module parameter specifying IP version ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 Gerrit-Change-Number: 20037 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 12:24:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 13:52:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 13:52:56 +0000 Subject: Change in libosmo-abis[master]: tests: Disable stderr log color in trau_sync_test References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/20047 ) Change subject: tests: Disable stderr log color in trau_sync_test ...................................................................... tests: Disable stderr log color in trau_sync_test Change-Id: Ibe8e2d580848a41dd25e0ae2d95f83233be6ed9a --- M tests/trau_sync/trau_sync_test.c M tests/trau_sync/trau_sync_test.err 2 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/47/20047/1 diff --git a/tests/trau_sync/trau_sync_test.c b/tests/trau_sync/trau_sync_test.c index 392a236..d804b3e 100644 --- a/tests/trau_sync/trau_sync_test.c +++ b/tests/trau_sync/trau_sync_test.c @@ -79,6 +79,7 @@ int main(int argc, char **argv) { osmo_init_logging2(NULL, NULL); + log_set_use_color(osmo_stderr_target, 0); osmo_fsm_log_addr(false); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); test_body(); diff --git a/tests/trau_sync/trau_sync_test.err b/tests/trau_sync/trau_sync_test.err index f3eac3c..7e4a24a 100644 --- a/tests/trau_sync/trau_sync_test.err +++ b/tests/trau_sync/trau_sync_test.err @@ -1,15 +1,14 @@ <0000> trau_sync(test){WAIT_FRAME_ALIGN}: Allocated -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST -<0000> trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS - \ No newline at end of file +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST +<0000> trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/20047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ibe8e2d580848a41dd25e0ae2d95f83233be6ed9a Gerrit-Change-Number: 20047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 13:53:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 13:53:43 +0000 Subject: Change in libosmo-abis[master]: tests: Disable stderr log color in trau_sync_test In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/20047 ) Change subject: tests: Disable stderr log color in trau_sync_test ...................................................................... Patch Set 1: This test was added after last libosmo-abis release, so it won't be affected in older versions once https://gerrit.osmocom.org/c/libosmocore/+/19336 gets merged. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/20047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ibe8e2d580848a41dd25e0ae2d95f83233be6ed9a Gerrit-Change-Number: 20047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Sep 2020 13:53:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 13:54:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 13:54:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Rename IP address module parameter specifying IP version In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 ) Change subject: mgw: Rename IP address module parameter specifying IP version ...................................................................... mgw: Rename IP address module parameter specifying IP version Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 --- M mgw/MGCP_Test.default M mgw/MGCP_Test.ttcn 2 files changed, 33 insertions(+), 33 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.default b/mgw/MGCP_Test.default index 4336033..35f7ed0 100644 --- a/mgw/MGCP_Test.default +++ b/mgw/MGCP_Test.default @@ -14,9 +14,9 @@ [MODULE_PARAMETERS] mp_local_udp_port := 2727; -mp_local_ip:= "127.0.0.1"; +mp_local_ipv4:= "127.0.0.1"; mp_remote_udp_port := 2427; -mp_remote_ip:= "127.0.0.1"; +mp_remote_ipv4:= "127.0.0.1"; Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMGW"; [MAIN_CONTROLLER] diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 47a7690..c41466a 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -64,9 +64,9 @@ * default values assigned below are used */ modulepar { PortNumber mp_local_udp_port := 2727; - charstring mp_local_ip := "127.0.0.1"; + charstring mp_local_ipv4 := "127.0.0.1"; PortNumber mp_remote_udp_port := 2427; - charstring mp_remote_ip := "127.0.0.1"; + charstring mp_remote_ipv4 := "127.0.0.1"; PortNumber mp_local_rtp_port_base := 10000; PortNumber mp_local_osmux_port := 1985; } @@ -124,7 +124,7 @@ /* connect the MGCP test port using the given * source/destionation ip/port and store the connection id in g_mgcp_conn_id * */ - res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {} }); + res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ipv4, mp_remote_udp_port, mp_local_ipv4, mp_local_udp_port, 0, { udp := {} }); if (not ispresent(res.connId)) { setverdict(fail, "Could not connect MGCP, check your configuration"); mtc.stop; @@ -224,9 +224,9 @@ function tr_MGCP_RecvFrom_R(template MgcpResponse resp) runs on dummy_CT return template MGCP_RecvFrom { var template MGCP_RecvFrom mrf := { connId := g_mgcp_conn_id, - remName := mp_remote_ip, + remName := mp_remote_ipv4, remPort := mp_remote_udp_port, - locName := mp_local_ip, + locName := mp_local_ipv4, locPort := mp_local_udp_port, msg := { response := resp } } @@ -1080,7 +1080,7 @@ var OsmuxTxHandle tx_hdl; f_init(ep, true); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1")); flow.em.portnr := mp_local_osmux_port; flow.osmux_cid := -1; f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow, false); @@ -1117,7 +1117,7 @@ var OsmuxTxHandle tx_hdl; f_init(ep, true); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := mp_local_osmux_port; flow.osmux_cid := 2; f_flow_create_osmux(OsmuxEM, ep, call_id, "loopback", flow); @@ -1198,7 +1198,7 @@ f_init(ep, true); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1209,7 +1209,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; flow[1].osmux_cid := 2; flow[1].osmux_cfg := c_OsmuxemDefaultCfg; @@ -1277,7 +1277,7 @@ f_init(ep, true); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1290,7 +1290,7 @@ /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; if (crcx_osmux_wildcard) { flow[1].osmux_cid := -1; @@ -1591,7 +1591,7 @@ var RtpemStats stats; f_init(ep); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow, true); @@ -1629,7 +1629,7 @@ var RtpemStats stats; f_init(ep); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "loopback", flow); @@ -1663,13 +1663,13 @@ f_init(ep); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, pt_a, codec_name_a)); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, pt_a, codec_name_a)); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, pt_b, codec_name_b)); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, pt_b, codec_name_b)); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]); @@ -1739,13 +1739,13 @@ f_init(ep); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 3, "GSM/8000/1")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], false); /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 3, "GSM/8000/1")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], false); @@ -1841,13 +1841,13 @@ f_init(ep); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 98, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 98, "AMR/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 98, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 98, "AMR/8000")); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]); @@ -1857,8 +1857,8 @@ f_sleep(0.5); /* Start inserting unsolicited RTP packets */ - f_rtpem_bind(RTPEM[2], mp_local_ip, unsolicited_port); - f_rtpem_connect(RTPEM[2], mp_remote_ip, flow[0].mgw.portnr); + f_rtpem_bind(RTPEM[2], mp_local_ipv4, unsolicited_port); + f_rtpem_connect(RTPEM[2], mp_remote_ipv4, flow[0].mgw.portnr); f_rtpem_mode(RTPEM[2], RTPEM_MODE_TXONLY); f_sleep(0.5); @@ -1894,13 +1894,13 @@ f_init(ep); /* First connection (BTS) */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "GSM-EFR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "GSM-EFR/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* Second connection (PBX) */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "GSM-EFR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "GSM-EFR/8000")); flow[1].em.portnr := 20000; f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]); @@ -1920,8 +1920,8 @@ * transmitting for a while. We simulate this by injecting * some unsolicited packets on the behalf of the old source, * (old remote port) */ - f_rtpem_bind(RTPEM[2], mp_local_ip, port_old); - f_rtpem_connect(RTPEM[2], mp_remote_ip, flow[0].mgw.portnr); + f_rtpem_bind(RTPEM[2], mp_local_ipv4, port_old); + f_rtpem_connect(RTPEM[2], mp_remote_ipv4, flow[0].mgw.portnr); f_rtpem_mode(RTPEM[2], RTPEM_MODE_TXONLY); f_sleep(1.0); f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE); @@ -1968,7 +1968,7 @@ f_vty_transceive(MGWVTY, "rtp-patch rfc5993hr"); /* Connection #0 (Bidirectional) */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; flow[0].rtp_cfg := c_RtpemDefaultCfg; @@ -1978,7 +1978,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* Connection #1 (Bidirectional) */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000")); flow[1].em.portnr := 20000; flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; @@ -2033,7 +2033,7 @@ f_init(ep); /* Connection #0 (Bidirectional) */ - flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; flow[0].rtp_cfg := c_RtpemDefaultCfg; @@ -2044,7 +2044,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* Connection #1 (Bidirectional) */ - flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); flow[1].em.portnr := 20000; flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; @@ -2123,7 +2123,7 @@ f_vty_config(MGWVTY, "mgcp", "conn-timeout 1"); /* reset in f_init_vty() */ log("Sending RTP data for 1.5s"); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "loopback", flow); f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); @@ -2208,7 +2208,7 @@ var RtpemStats stats; f_init(ep); - flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1")); + flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := 10000; f_flow_create(RTPEM[0], ep, call_id, "loopback", flow); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766 Gerrit-Change-Number: 20037 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 13:54:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 13:54:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 addresses in MGCP messages In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 ) Change subject: mgw: Test IPv6 addresses in MGCP messages ...................................................................... mgw: Test IPv6 addresses in MGCP messages These tests verify that osmo-mgw handles requests no matter of IP version used in the remote address. Change-Id: Ib134dda5a8f7c8f50968b6ce330f9986ae72575d --- M mgw/MGCP_Test.ttcn M mgw/osmo-mgw.cfg 2 files changed, 69 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index c41466a..b767dd4 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2230,6 +2230,72 @@ setverdict(pass); } + /* test valid CRCX then MDCX with IPv4 address, MGW provides a local IPv4 too */ + testcase TC_crcx_mdcx_ip4() runs on dummy_CT { + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var template MgcpCommand cmd; + var MgcpResponse resp; + var MgcpCallId call_id := '1234'H; + var MgcpConnectionId conn_id; + + f_init(ep); + + /* create the connection on the MGW */ + cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); + conn_id := extract_conn_id(resp); + + cmd := ts_MDCX(get_next_trans_id(), ep, "sendrecv", call_id, conn_id); + cmd.sdp := ts_SDP("127.0.0.2", "127.0.0.1", "23", "42", 2344, { "98" }, + { valueof(ts_SDP_rtpmap(98, "AMR/8000")), + valueof(ts_SDP_ptime(20)) }); + resp := mgcp_transceive_mgw(cmd, tr_MDCX_ACK); + + if (not ispresent(resp.sdp) or not ispresent(resp.sdp.connection)) { + setverdict(fail, "No RemoteConnection info found in MDCX ACK!"); + } + if (not match(resp.sdp.connection, ts_SDP_connection_IP("127.0.0.1", "IP4"))) { + setverdict(fail, "Wrong RemoteConnection in MDCX ACK!", resp.sdp.connection); + } + + /* clean-up */ + f_dlcx_ok(ep, call_id); + setverdict(pass); + } + + /* test valid CRCX then MDCX with IPv6 address, MGW provides a local IPv6 too */ + testcase TC_crcx_mdcx_ip6() runs on dummy_CT { + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var template MgcpCommand cmd; + var MgcpResponse resp; + var MgcpCallId call_id := '1234'H; + var MgcpConnectionId conn_id; + + f_init(ep); + + /* create the connection on the MGW */ + cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); + conn_id := extract_conn_id(resp); + + cmd := ts_MDCX(get_next_trans_id(), ep, "sendrecv", call_id, conn_id); + cmd.sdp := ts_SDP("::2", "::1", "23", "42", 2344, { "98" }, + { valueof(ts_SDP_rtpmap(98, "AMR/8000")), + valueof(ts_SDP_ptime(20)) }); + resp := mgcp_transceive_mgw(cmd, tr_MDCX_ACK); + + if (not ispresent(resp.sdp) or not ispresent(resp.sdp.connection)) { + setverdict(fail, "No RemoteConnection info found in MDCX ACK!"); + } + if (not match(resp.sdp.connection, ts_SDP_connection_IP("::1", "IP6"))) { + setverdict(fail, "Wrong RemoteConnection in MDCX ACK!", resp.sdp.connection); + } + + /* clean-up */ + f_dlcx_ok(ep, call_id); + setverdict(pass); + } + control { execute(TC_selftest()); execute(TC_crcx()); @@ -2290,5 +2356,7 @@ execute(TC_e1_crcx_with_overlap()); execute(TC_e1_crcx_loopback()); + execute(TC_crcx_mdcx_ip4()); + execute(TC_crcx_mdcx_ip6()); } } diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index edc8190..beb6fdf 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -22,6 +22,7 @@ bind port 2427 rtp port-range 4002 16000 rtp bind-ip 127.0.0.1 + rtp bind-ip-v6 ::1 rtp ip-probing rtp ip-dscp 184 no rtp keep-alive -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib134dda5a8f7c8f50968b6ce330f9986ae72575d Gerrit-Change-Number: 20038 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 13:54:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 13:54:55 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Update module param addresses naming to support ipv6 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20041 ) Change subject: ttcn3-mgw: Update module param addresses naming to support ipv6 ...................................................................... ttcn3-mgw: Update module param addresses naming to support ipv6 Depends: osmo-ttcn3-hacks.git Change-Id Ia393d7175de277ec8fa524ba74bf3b150b74c766 Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 --- M ttcn3-mgw-test/MGCP_Test.cfg M ttcn3-mgw-test/jenkins.sh M ttcn3-mgw-test/osmo-mgw.cfg 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/ttcn3-mgw-test/MGCP_Test.cfg b/ttcn3-mgw-test/MGCP_Test.cfg index 0c6a550..b70514e 100644 --- a/ttcn3-mgw-test/MGCP_Test.cfg +++ b/ttcn3-mgw-test/MGCP_Test.cfg @@ -8,8 +8,10 @@ *.MGWVTY.CTRL_HOSTNAME := "172.18.4.180" [MODULE_PARAMETERS] -mp_local_ip:= "172.18.4.181"; -mp_remote_ip:= "172.18.4.180"; +mp_local_ipv4 := "172.18.4.181"; +mp_local_ipv6 := "fd02:db8:4::181"; +mp_remote_ipv4 := "172.18.4.180"; +mp_remote_ipv6 := "fd02:db8:4::180"; [MAIN_CONTROLLER] diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 228740b..c49096b 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -20,6 +20,8 @@ sed -i "s/e1_line.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg sed -i "s/e1_input.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg sed -i "s/line 0.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg + # Disable IPv6 until osmo-mgw .git release > 1.7.0 is available + sed "/fd02:db8/d" -i $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi # start container with mgw in background diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index 8036058..1c49b11 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -31,6 +31,7 @@ bind port 2427 rtp port-range 4002 16000 rtp bind-ip 172.18.4.180 + rtp bind-ip-v6 fd02:db8:4::180 rtp ip-probing rtp ip-dscp 184 no rtp keep-alive -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 Gerrit-Change-Number: 20041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 13:56:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 13:56:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 RTP streams in osmo-mgw In-Reply-To: References: Message-ID: Hello dexter, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 to look at the new patch set (#3). Change subject: mgw: Test IPv6 RTP streams in osmo-mgw ...................................................................... mgw: Test IPv6 RTP streams in osmo-mgw Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 --- M mgw/MGCP_Test.ttcn 1 file changed, 83 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/20039/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 Gerrit-Change-Number: 20039 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:18:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:18:09 +0000 Subject: Change in osmo-bts[pespin/1.2.1]: tx_power_test: Disable using color in log output References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20048 ) Change subject: tx_power_test: Disable using color in log output ...................................................................... tx_power_test: Disable using color in log output It's really not used and only adds unneeded variabilities to output. This patch is a cherry-pick from master's 7bda77928c0e08d4b1ab1efe3e1284fa372779ea, which allows last release of osmo-bts to work with fixed libosmocore (libosmocore.git Ie38cc639d7f4acd908f357e5bfb3ced07147583e). Change-Id: I45cce47f9248c222707f0ed5a4349b0308ad891f --- M tests/tx_power/tx_power_test.c M tests/tx_power/tx_power_test.err 2 files changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/20048/1 diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index 34fbeb7..d77c2e1 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -214,6 +214,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); bts = gsm_bts_alloc(tall_bts_ctx, 0); if (!bts) { diff --git a/tests/tx_power/tx_power_test.err b/tests/tx_power/tx_power_test.err index bf33b42..79b5297 100644 --- a/tests/tx_power/tx_power_test.err +++ b/tests/tx_power/tx_power_test.err @@ -1,38 +1,37 @@ power_ramp_start(cur=0, tgt=40000) -Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) -power_ramp_start(cur=0, tgt=33000) -ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) -ramping TRX board output power to -8000 mdBm. -ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) -ramping TRX board output power to -6000 mdBm. -ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) -ramping TRX board output power to -4000 mdBm. -ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) -ramping TRX board output power to -2000 mdBm. -ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) -ramping TRX board output power to 0 mdBm. -ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) -ramping TRX board output power to 2000 mdBm. -ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) -ramping TRX board output power to 4000 mdBm. -ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) -ramping TRX board output power to 6000 mdBm. -ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) -ramping TRX board output power to 8000 mdBm. -ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) -ramping TRX board output power to 10000 mdBm. -ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) -ramping TRX board output power to 12000 mdBm. -ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) -ramping TRX board output power to 14000 mdBm. -ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) -ramping TRX board output power to 16000 mdBm. -ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) -ramping TRX board output power to 18000 mdBm. -ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) -ramping TRX board output power to 20000 mdBm. -ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) -ramping TRX board output power to 22000 mdBm. -ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) -ramping TRX board output power to 23000 mdBm. - \ No newline at end of file +Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) +power_ramp_start(cur=0, tgt=33000) +ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) +ramping TRX board output power to -8000 mdBm. +ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) +ramping TRX board output power to -6000 mdBm. +ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) +ramping TRX board output power to -4000 mdBm. +ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) +ramping TRX board output power to -2000 mdBm. +ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) +ramping TRX board output power to 0 mdBm. +ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) +ramping TRX board output power to 2000 mdBm. +ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) +ramping TRX board output power to 4000 mdBm. +ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) +ramping TRX board output power to 6000 mdBm. +ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) +ramping TRX board output power to 8000 mdBm. +ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) +ramping TRX board output power to 10000 mdBm. +ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) +ramping TRX board output power to 12000 mdBm. +ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) +ramping TRX board output power to 14000 mdBm. +ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) +ramping TRX board output power to 16000 mdBm. +ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) +ramping TRX board output power to 18000 mdBm. +ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) +ramping TRX board output power to 20000 mdBm. +ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) +ramping TRX board output power to 22000 mdBm. +ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) +ramping TRX board output power to 23000 mdBm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I45cce47f9248c222707f0ed5a4349b0308ad891f Gerrit-Change-Number: 20048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:22:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:22:25 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bpespin/1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E1-dirty_=E2=86=92_1=2E2=2E2?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20049 ) Change subject: Bump version: 1.2.1-dirty ? 1.2.2 ...................................................................... Bump version: 1.2.1-dirty ? 1.2.2 Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/20049/1 diff --git a/debian/changelog b/debian/changelog index 7d7b882..468ee19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-bts (1.2.2) unstable; urgency=medium + + * tx_power_test: Disable using color in log output + + -- Pau Espin Pedrol Wed, 09 Sep 2020 16:21:45 +0200 + osmo-bts (1.2.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a Gerrit-Change-Number: 20049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:23:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:23:27 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Patch Set 1: > Patch Set 1: > > > My proposal: Do a patch release for osmo-bts on top of latest release with the osmo-bts patch fixing the test so this way last release still works with both new and old libosmocore. Agree? > > ack New osmo-bts patch release here: https://gerrit.osmocom.org/c/osmo-bts/+/20049 So I think we can merge that one and then merge this patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:23:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:24:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:24:24 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bpespin/1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E1-dirty_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20049 ) Change subject: Bump version: 1.2.1-dirty ? 1.2.2 ...................................................................... Patch Set 1: Reminder: Push tag once merged. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a Gerrit-Change-Number: 20049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:24:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:32:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:32:35 +0000 Subject: Change in osmo-msc[pespin/1.6.2]: fix crash for unknown MI during Paging Response References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20050 ) Change subject: fix crash for unknown MI during Paging Response ...................................................................... fix crash for unknown MI during Paging Response This patch is a cherry-pick from master's 667d5e0b95d01946ba5e80ae7e202576c05cc5c1, to create a new patch release to avoid osmo-msc crash during ttcn3-msc-tests-latest run. Related: OS#4724 Related: I40496bbccbbd9c496cfa57df49e26f124a2b1554 (osmo-ttcn3-hacks) Change-Id: Ia2c8fa745cfab17ed7114d433f625ddc02ae7b11 --- M src/libmsc/gsm_04_08.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/50/20050/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b284ccd..3594bfc 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1185,7 +1185,12 @@ vsub = msc_a_vsub(msc_a); if (!vsub) { LOG_MSC_A(msc_a, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); - msc_a_put(msc_a, MSC_A_USE_PAGING_RESPONSE); + + /* Above MSC_A_USE_PAGING_RESPONSE may already have been removed by a forced release, put that use only + * if it still exists. (see msc_a_fsm_releasing_onenter()) */ + if (osmo_use_count_by(&msc_a->use_count, MSC_A_USE_PAGING_RESPONSE)) + msc_a_put(msc_a, MSC_A_USE_PAGING_RESPONSE); + return -EIO; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: Ia2c8fa745cfab17ed7114d433f625ddc02ae7b11 Gerrit-Change-Number: 20050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:32:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:32:36 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bpespin/1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E2=2E1-602c0_=E2=86=92_1=2E6=2E3?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20051 ) Change subject: Bump version: 1.6.2.1-602c0 ? 1.6.3 ...................................................................... Bump version: 1.6.2.1-602c0 ? 1.6.3 Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/51/20051/1 diff --git a/debian/changelog b/debian/changelog index e1651e5..81555fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-msc (1.6.3) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix crash for unknown MI during Paging Response + + -- Pau Espin Pedrol Wed, 09 Sep 2020 16:29:49 +0200 + osmo-msc (1.6.2) unstable; urgency=medium * vlr_auth_fsm: Fix compilation with gcc-10 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 Gerrit-Change-Number: 20051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:34:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 14:34:06 +0000 Subject: Change in osmo-bts[pespin/1.2.1]: tx_power_test: Disable using color in log output In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20048 ) Change subject: tx_power_test: Disable using color in log output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I45cce47f9248c222707f0ed5a4349b0308ad891f Gerrit-Change-Number: 20048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 09 Sep 2020 14:34:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:34:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 14:34:22 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bpespin/1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E1-dirty_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20049 ) Change subject: Bump version: 1.2.1-dirty ? 1.2.2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a Gerrit-Change-Number: 20049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Sep 2020 14:34:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:35:01 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 9 Sep 2020 14:35:01 +0000 Subject: Change in osmo-msc[pespin/1.6.2]: fix crash for unknown MI during Paging Response In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20050 ) Change subject: fix crash for unknown MI during Paging Response ...................................................................... Patch Set 1: Code-Review+2 backport +2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: Ia2c8fa745cfab17ed7114d433f625ddc02ae7b11 Gerrit-Change-Number: 20050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Sep 2020 14:35:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:42:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:42:40 +0000 Subject: Change in osmo-msc[pespin/1.6.2]: fix crash for unknown MI during Paging Response In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20050 ) Change subject: fix crash for unknown MI during Paging Response ...................................................................... Patch Set 1: Verified+1 Tests are failing due to new libosmo-mgcp-client changing VTY stuff, but since anyway we are breaking ABI between releases we don't care since it's not related to this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: Ia2c8fa745cfab17ed7114d433f625ddc02ae7b11 Gerrit-Change-Number: 20050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:42:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:42:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:42:50 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bpespin/1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E2=2E1-602c0_=E2=86=92_1=2E6=2E3?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20051 ) Change subject: Bump version: 1.6.2.1-602c0 ? 1.6.3 ...................................................................... Patch Set 1: Verified+1 Tests are failing due to new libosmo-mgcp-client changing VTY stuff, but since anyway we are breaking ABI between releases we don't care since it's not related to this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 Gerrit-Change-Number: 20051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:42:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:44:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:44:21 +0000 Subject: Change in osmo-msc[pespin/1.6.2]: fix crash for unknown MI during Paging Response In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20050 ) Change subject: fix crash for unknown MI during Paging Response ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: Ia2c8fa745cfab17ed7114d433f625ddc02ae7b11 Gerrit-Change-Number: 20050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:44:27 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bpespin/1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E2=2E1-602c0_=E2=86=92_1=2E6=2E3?= In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20051 ) Change subject: Bump version: 1.6.2.1-602c0 ? 1.6.3 ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 Gerrit-Change-Number: 20051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:44:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:44:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bpespin/1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E2=2E1-602c0_=E2=86=92_1=2E6=2E3?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20051 ) Change subject: Bump version: 1.6.2.1-602c0 ? 1.6.3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 Gerrit-Change-Number: 20051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:44:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:44:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:44:42 +0000 Subject: Change in osmo-msc[pespin/1.6.2]: fix crash for unknown MI during Paging Response In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20050 ) Change subject: fix crash for unknown MI during Paging Response ...................................................................... fix crash for unknown MI during Paging Response This patch is a cherry-pick from master's 667d5e0b95d01946ba5e80ae7e202576c05cc5c1, to create a new patch release to avoid osmo-msc crash during ttcn3-msc-tests-latest run. Related: OS#4724 Related: I40496bbccbbd9c496cfa57df49e26f124a2b1554 (osmo-ttcn3-hacks) Change-Id: Ia2c8fa745cfab17ed7114d433f625ddc02ae7b11 --- M src/libmsc/gsm_04_08.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved pespin: Verified diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b284ccd..3594bfc 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1185,7 +1185,12 @@ vsub = msc_a_vsub(msc_a); if (!vsub) { LOG_MSC_A(msc_a, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); - msc_a_put(msc_a, MSC_A_USE_PAGING_RESPONSE); + + /* Above MSC_A_USE_PAGING_RESPONSE may already have been removed by a forced release, put that use only + * if it still exists. (see msc_a_fsm_releasing_onenter()) */ + if (osmo_use_count_by(&msc_a->use_count, MSC_A_USE_PAGING_RESPONSE)) + msc_a_put(msc_a, MSC_A_USE_PAGING_RESPONSE); + return -EIO; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: Ia2c8fa745cfab17ed7114d433f625ddc02ae7b11 Gerrit-Change-Number: 20050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:44:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:44:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bpespin/1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E2=2E1-602c0_=E2=86=92_1=2E6=2E3?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20051 ) Change subject: Bump version: 1.6.2.1-602c0 ? 1.6.3 ...................................................................... Bump version: 1.6.2.1-602c0 ? 1.6.3 Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/debian/changelog b/debian/changelog index e1651e5..81555fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-msc (1.6.3) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix crash for unknown MI during Paging Response + + -- Pau Espin Pedrol Wed, 09 Sep 2020 16:29:49 +0200 + osmo-msc (1.6.2) unstable; urgency=medium * vlr_auth_fsm: Fix compilation with gcc-10 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 Gerrit-Change-Number: 20051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:45:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:45:27 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bpespin/1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E2=2E1-602c0_=E2=86=92_1=2E6=2E3?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20051 ) Change subject: Bump version: 1.6.2.1-602c0 ? 1.6.3 ...................................................................... Patch Set 1: tag pushed. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: pespin/1.6.2 Gerrit-Change-Id: I96bfaa516b2443c0349e73dae674b4c01a19dd72 Gerrit-Change-Number: 20051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:45:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:48:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:48:21 +0000 Subject: Change in libosmo-abis[master]: tests: Disable stderr log color in trau_sync_test In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/20047 ) Change subject: tests: Disable stderr log color in trau_sync_test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/20047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ibe8e2d580848a41dd25e0ae2d95f83233be6ed9a Gerrit-Change-Number: 20047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:48:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:48:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:48:23 +0000 Subject: Change in libosmo-abis[master]: tests: Disable stderr log color in trau_sync_test In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/20047 ) Change subject: tests: Disable stderr log color in trau_sync_test ...................................................................... tests: Disable stderr log color in trau_sync_test Change-Id: Ibe8e2d580848a41dd25e0ae2d95f83233be6ed9a --- M tests/trau_sync/trau_sync_test.c M tests/trau_sync/trau_sync_test.err 2 files changed, 14 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/trau_sync/trau_sync_test.c b/tests/trau_sync/trau_sync_test.c index 392a236..d804b3e 100644 --- a/tests/trau_sync/trau_sync_test.c +++ b/tests/trau_sync/trau_sync_test.c @@ -79,6 +79,7 @@ int main(int argc, char **argv) { osmo_init_logging2(NULL, NULL); + log_set_use_color(osmo_stderr_target, 0); osmo_fsm_log_addr(false); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); test_body(); diff --git a/tests/trau_sync/trau_sync_test.err b/tests/trau_sync/trau_sync_test.err index f3eac3c..7e4a24a 100644 --- a/tests/trau_sync/trau_sync_test.err +++ b/tests/trau_sync/trau_sync_test.err @@ -1,15 +1,14 @@ <0000> trau_sync(test){WAIT_FRAME_ALIGN}: Allocated -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST -<0000> trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS - \ No newline at end of file +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +<0000> trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +<0000> trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST +<0000> trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/20047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ibe8e2d580848a41dd25e0ae2d95f83233be6ed9a Gerrit-Change-Number: 20047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:59:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:59:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bpespin/1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E1-dirty_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20049 ) Change subject: Bump version: 1.2.1-dirty ? 1.2.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a Gerrit-Change-Number: 20049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 14:59:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:59:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:59:40 +0000 Subject: Change in osmo-bts[pespin/1.2.1]: tx_power_test: Disable using color in log output In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20048 ) Change subject: tx_power_test: Disable using color in log output ...................................................................... tx_power_test: Disable using color in log output It's really not used and only adds unneeded variabilities to output. This patch is a cherry-pick from master's 7bda77928c0e08d4b1ab1efe3e1284fa372779ea, which allows last release of osmo-bts to work with fixed libosmocore (libosmocore.git Ie38cc639d7f4acd908f357e5bfb3ced07147583e). Change-Id: I45cce47f9248c222707f0ed5a4349b0308ad891f --- M tests/tx_power/tx_power_test.c M tests/tx_power/tx_power_test.err 2 files changed, 37 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index 34fbeb7..d77c2e1 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -214,6 +214,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); bts = gsm_bts_alloc(tall_bts_ctx, 0); if (!bts) { diff --git a/tests/tx_power/tx_power_test.err b/tests/tx_power/tx_power_test.err index bf33b42..79b5297 100644 --- a/tests/tx_power/tx_power_test.err +++ b/tests/tx_power/tx_power_test.err @@ -1,38 +1,37 @@ power_ramp_start(cur=0, tgt=40000) -Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) -power_ramp_start(cur=0, tgt=33000) -ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) -ramping TRX board output power to -8000 mdBm. -ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) -ramping TRX board output power to -6000 mdBm. -ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) -ramping TRX board output power to -4000 mdBm. -ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) -ramping TRX board output power to -2000 mdBm. -ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) -ramping TRX board output power to 0 mdBm. -ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) -ramping TRX board output power to 2000 mdBm. -ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) -ramping TRX board output power to 4000 mdBm. -ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) -ramping TRX board output power to 6000 mdBm. -ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) -ramping TRX board output power to 8000 mdBm. -ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) -ramping TRX board output power to 10000 mdBm. -ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) -ramping TRX board output power to 12000 mdBm. -ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) -ramping TRX board output power to 14000 mdBm. -ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) -ramping TRX board output power to 16000 mdBm. -ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) -ramping TRX board output power to 18000 mdBm. -ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) -ramping TRX board output power to 20000 mdBm. -ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) -ramping TRX board output power to 22000 mdBm. -ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) -ramping TRX board output power to 23000 mdBm. - \ No newline at end of file +Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) +power_ramp_start(cur=0, tgt=33000) +ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) +ramping TRX board output power to -8000 mdBm. +ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) +ramping TRX board output power to -6000 mdBm. +ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) +ramping TRX board output power to -4000 mdBm. +ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) +ramping TRX board output power to -2000 mdBm. +ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) +ramping TRX board output power to 0 mdBm. +ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) +ramping TRX board output power to 2000 mdBm. +ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) +ramping TRX board output power to 4000 mdBm. +ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) +ramping TRX board output power to 6000 mdBm. +ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) +ramping TRX board output power to 8000 mdBm. +ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) +ramping TRX board output power to 10000 mdBm. +ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) +ramping TRX board output power to 12000 mdBm. +ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) +ramping TRX board output power to 14000 mdBm. +ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) +ramping TRX board output power to 16000 mdBm. +ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) +ramping TRX board output power to 18000 mdBm. +ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) +ramping TRX board output power to 20000 mdBm. +ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) +ramping TRX board output power to 22000 mdBm. +ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) +ramping TRX board output power to 23000 mdBm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I45cce47f9248c222707f0ed5a4349b0308ad891f Gerrit-Change-Number: 20048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 14:59:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 14:59:42 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bpespin/1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E1-dirty_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20049 ) Change subject: Bump version: 1.2.1-dirty ? 1.2.2 ...................................................................... Bump version: 1.2.1-dirty ? 1.2.2 Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 7d7b882..468ee19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-bts (1.2.2) unstable; urgency=medium + + * tx_power_test: Disable using color in log output + + -- Pau Espin Pedrol Wed, 09 Sep 2020 16:21:45 +0200 + osmo-bts (1.2.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a Gerrit-Change-Number: 20049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 15:00:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 15:00:26 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bpespin/1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E1-dirty_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20049 ) Change subject: Bump version: 1.2.1-dirty ? 1.2.2 ...................................................................... Patch Set 1: tag pushed -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: pespin/1.2.1 Gerrit-Change-Id: I9a10e09c51a74c2af8f3d9b758abd701fcbf646a Gerrit-Change-Number: 20049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 15:00:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 15:05:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 9 Sep 2020 15:05:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn at 762 PS1, Line 762: repeat; IIUC we just simply need to remove this 'repeat'? We got a RESET, we sent an ACK, nothing else is left to do. No need to wait for the timeout and then exit. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 15:05:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 15:08:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 15:08:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn at 762 PS1, Line 762: repeat; > IIUC we just simply need to remove this 'repeat'? [?] We could still receive a RESET-ACK for the RESET we sent, so it's better waiting a bit if that happens just in case, in order to avoid receiving it later at some unexpected time when we expect another type of packet. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 15:08:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 15:38:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 9 Sep 2020 15:38:56 +0000 Subject: Change in libosmocore[master]: logging: introduce experimental 'systemd-journal' target In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20045 ) Change subject: logging: introduce experimental 'systemd-journal' target ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I609f5cf438e6ad9038d8fc95f00add6aac29fb23 Gerrit-Change-Number: 20045 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 09 Sep 2020 15:38:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 15:40:24 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 9 Sep 2020 15:40:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn at 762 PS1, Line 762: repeat; > We could still receive a RESET-ACK for the RESET we sent, so it's better waiting a bit if that happe [?] no, if the BSC sent a RESET, all prior RESET sent by us is void. It basically means the BSC has restarted. It implies that the BSC has no recollection of the ttcn3's earlier RESET, otherwise it would have replied with an ACK instead of a new RESET. At least that's how it should be. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 15:40:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 16:09:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 16:09:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930/1/bsc/BSC_Tests.ttcn at 762 PS1, Line 762: repeat; > no, if the BSC sent a RESET, all prior RESET sent by us is void. [?] AFAIU it could be that both RESET originated on each side cross over the wire and BSC receives our RESET after having sent its own RESET (from its point of view). In that case, I'd expect the BSC to ack it with a RESET-ACK, so in theory it's still possible that we receive the RESET-ACK sometimes on the TTCN3 side. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 16:09:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 16:41:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 16:41:06 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Support IPv6 addresses (new version mncc 7) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 ) Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... mncc: Support IPv6 addresses (new version mncc 7) Change-Id: I3b1bebbcc9e36be43d8d055c8d28cbb38ff21b37 --- M src/call.h M src/mncc.c M src/mncc_protocol.h M src/sdp.c M src/sip.c 5 files changed, 75 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/52/20052/1 diff --git a/src/call.h b/src/call.h index 7f67066..d1732f9 100644 --- a/src/call.h +++ b/src/call.h @@ -7,6 +7,7 @@ #include #include +#include struct sip_agent; struct mncc_connection; @@ -49,8 +50,7 @@ /** * RTP data */ - uint32_t ip; - uint16_t port; + struct sockaddr_storage addr; uint32_t payload_type; uint32_t payload_msg_type; diff --git a/src/mncc.c b/src/mncc.c index 16eed96..0725d4c 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -174,7 +174,7 @@ { struct gsm_mncc_rtp mncc = { 0, }; int rc; - char ip_addr[INET_ADDRSTRLEN]; + char ip_addr[INET6_ADDRSTRLEN]; /* * Send RTP CONNECT and we handle the general failure of it by @@ -182,16 +182,15 @@ */ mncc.msg_type = MNCC_RTP_CONNECT; mncc.callref = leg->callref; - mncc.ip = ntohl(other->ip); - mncc.port = other->port; + mncc.addr = other->addr; mncc.payload_type = other->payload_type; /* * FIXME: mncc.payload_msg_type should already be compatible.. but * payload_type should be different.. */ - struct in_addr net = { .s_addr = other->ip }; - inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", ip_addr, mncc.port); + LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", + osmo_sockaddr_ntop((const struct sockaddr*)&other->addr, ip_addr), + osmo_sockaddr_port((const struct sockaddr*)&other->addr)); rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc)); if (rc != sizeof(mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", @@ -272,7 +271,8 @@ * FIXME: We would like to keep this as recvonly... */ other_leg = call_leg_other(&leg->base); - if (other_leg && other_leg->port != 0 && other_leg->ip != 0) + if (other_leg && other_leg->addr.ss_family != AF_UNSPEC && + osmo_sockaddr_port((const struct sockaddr *)&other_leg->addr) != 0) send_rtp_connect(leg, other_leg); } @@ -397,7 +397,9 @@ } /* extract information about where the RTP is */ - if (rtp->ip != 0 || rtp->port != 0 || rtp->payload_type != 0) + if (rtp->addr.ss_family != AF_UNSPEC || + osmo_sockaddr_port((const struct sockaddr *)&rtp->addr) != 0 || + rtp->payload_type != 0) return; LOGP(DMNCC, LOGL_ERROR, "leg(%u) rtp connect failed\n", rtp->callref); @@ -412,7 +414,7 @@ { const struct gsm_mncc_rtp *rtp; struct mncc_call_leg *leg; - char ip_addr[INET_ADDRSTRLEN]; + char ip_addr[INET6_ADDRSTRLEN]; if (rc < sizeof(*rtp)) { LOGP(DMNCC, LOGL_ERROR, "gsm_mncc_rtp of wrong size %d < %zu\n", @@ -428,17 +430,16 @@ } /* extract information about where the RTP is */ - leg->base.ip = htonl(rtp->ip); - leg->base.port = rtp->port; + leg->base.addr = rtp->addr; leg->base.payload_type = rtp->payload_type; leg->base.payload_msg_type = rtp->payload_msg_type; /* TODO.. now we can continue with the call */ - struct in_addr net = { .s_addr = leg->base.ip }; - inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); LOGP(DMNCC, LOGL_INFO, "RTP continue leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", - leg->callref, ip_addr, leg->base.port, + leg->callref, + osmo_sockaddr_ntop((const struct sockaddr*)&leg->base.addr, ip_addr), + osmo_sockaddr_port((const struct sockaddr*)&leg->base.addr), leg->base.payload_type, leg->base.payload_msg_type); stop_cmd_timer(leg, MNCC_RTP_CREATE); continue_call(leg); diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index b6f6635..5d35191 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -1,4 +1,4 @@ -/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface +/* GSM Mobile Radio Interface Layer 3 messages on the A-bis interface * 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */ /* (C) 2008-2009 by Harald Welte @@ -28,6 +28,7 @@ #include #include +#include struct gsm_network; struct msgb; @@ -169,7 +170,7 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 6 +#define MNCC_SOCK_VERSION 7 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; @@ -188,8 +189,7 @@ struct gsm_mncc_rtp { uint32_t msg_type; uint32_t callref; - uint32_t ip; - uint16_t port; + struct sockaddr_storage addr; uint32_t payload_type; uint32_t payload_msg_type; char sdp[1024]; diff --git a/src/sdp.c b/src/sdp.c index 46330cd..0fd7a09 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -32,6 +32,8 @@ #include +#include + /* * Check if the media mode attribute exists in SDP, in this * case update the passed pointer with the media mode @@ -136,6 +138,7 @@ sdp_parser_t *parser; sdp_media_t *media; const char *sdp_data; + uint16_t port; bool found_conn = false, found_map = false; if (!sip->sip_payload || !sip->sip_payload->pl_data) { @@ -159,13 +162,22 @@ } for (conn = sdp->sdp_connection; conn; conn = conn->c_next) { - struct in_addr addr; - - if (conn->c_addrtype != sdp_addr_ip4) + switch (conn->c_addrtype) { + case sdp_addr_ip4: + leg->base.addr.ss_family = AF_INET; + inet_pton(AF_INET, conn->c_address, + &((struct sockaddr_in*)&leg->base.addr)->sin_addr); + found_conn = true; + break; + case sdp_addr_ip6: + leg->base.addr.ss_family = AF_INET6; + inet_pton(AF_INET6, conn->c_address, + &((struct sockaddr_in6*)&leg->base.addr)->sin6_addr); + found_conn = true; + break; + default: continue; - inet_aton(conn->c_address, &addr); - leg->base.ip = addr.s_addr; - found_conn = true; + } break; } @@ -181,7 +193,7 @@ if (!any_codec && strcasecmp(map->rm_encoding, leg->wanted_codec) != 0) continue; - leg->base.port = media->m_port; + port = media->m_port; leg->base.payload_type = map->rm_pt; found_map = true; break; @@ -198,18 +210,30 @@ return false; } + switch (leg->base.addr.ss_family) { + case AF_INET: + ((struct sockaddr_in*)&leg->base.addr)->sin_port = port; + break; + case AF_INET6: + ((struct sockaddr_in6*)&leg->base.addr)->sin6_port = port; + break; + default: + OSMO_ASSERT(0); + } + sdp_parser_free(parser); return true; } char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other, sdp_mode_t mode) { - struct in_addr net = { .s_addr = other->ip }; char *fmtp_str = NULL, *sdp; char *mode_attribute; - char ip_addr[INET_ADDRSTRLEN]; + char ip_addr[INET6_ADDRSTRLEN]; + char ipv; - inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); + osmo_sockaddr_ntop((const struct sockaddr*)&other->addr, ip_addr); + ipv = other->addr.ss_family == AF_INET6 ? '6' : '4'; leg->wanted_codec = app_media_name(other->payload_msg_type); if (strcmp(leg->wanted_codec, "AMR") == 0) @@ -235,16 +259,17 @@ sdp = talloc_asprintf(leg, "v=0\r\n" - "o=Osmocom 0 0 IN IP4 %s\r\n" + "o=Osmocom 0 0 IN IP%c %s\r\n" "s=GSM Call\r\n" - "c=IN IP4 %s\r\n" + "c=IN IP%c %s\r\n" "t=0 0\r\n" "m=audio %d RTP/AVP %d\r\n" "%s" "a=rtpmap:%d %s/8000\r\n" "%s", - ip_addr, ip_addr, - other->port, other->payload_type, + ipv, ip_addr, ipv, ip_addr, + osmo_sockaddr_port((const struct sockaddr *)&other->addr), + other->payload_type, fmtp_str ? fmtp_str : "", other->payload_type, leg->wanted_codec, diff --git a/src/sip.c b/src/sip.c index c635542..1854f39 100644 --- a/src/sip.c +++ b/src/sip.c @@ -25,6 +25,7 @@ #include "sdp.h" #include +#include #include #include @@ -33,6 +34,7 @@ #include #include +#include extern void *tall_mncc_ctx; @@ -110,7 +112,7 @@ struct call *call; struct sip_call_leg *leg; const char *from = NULL, *to = NULL; - char ip_addr[INET_ADDRSTRLEN]; + char ip_addr[INET6_ADDRSTRLEN]; LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); @@ -159,11 +161,9 @@ call_leg_release(&leg->base); return; } - struct in_addr net = { .s_addr = leg->base.ip }; - inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); LOGP(DSIP, LOGL_INFO, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n", - ip_addr, - leg->base.port, + osmo_sockaddr_ntop((const struct sockaddr *)&leg->base.addr, ip_addr), + osmo_sockaddr_port((const struct sockaddr *)&leg->base.addr), leg->base.payload_type); leg->base.release_call = sip_release_call; @@ -186,9 +186,8 @@ char *sdp; sdp_mode_t mode = sdp_sendrecv; - uint32_t ip = leg->base.ip; - uint16_t port = leg->base.port; - char ip_addr[INET_ADDRSTRLEN]; + char ip_addr[INE6T_ADDRSTRLEN]; + struct sockaddr_storage prev_addr = leg->base.addr; LOGP(DSIP, LOGL_INFO, "re-INVITE for call %s\n", sip->sip_call_id->i_id); @@ -214,9 +213,9 @@ return; } - struct in_addr net = { .s_addr = leg->base.ip }; - inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DSIP, LOGL_DEBUG, "pre re-INVITE have IP:port (%s:%u)\n", ip_addr, leg->base.port); + LOGP(DSIP, LOGL_DEBUG, "pre re-INVITE have IP:port (%s:%u)\n", + osmo_sockaddr_ntop((struct sockaddr*)&leg->base.addr, ip_addr), + osmo_sockaddr_port((struct sockaddr*)&leg->base.addr)); if (mode == sdp_sendonly) { /* SIP side places call on HOLD */ @@ -231,10 +230,11 @@ call_leg_release(&leg->base); return; } - struct in_addr net = { .s_addr = leg->base.ip }; - inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); - LOGP(DSIP, LOGL_DEBUG, "Media IP:port in re-INVITE: (%s:%u)\n", ip_addr, leg->base.port); - if (ip != leg->base.ip || port != leg->base.port) { + LOGP(DSIP, LOGL_DEBUG, "Media IP:port in re-INVITE: (%s:%u)\n", + osmo_sockaddr_ntop((struct sockaddr*)&leg->base.addr, ip_addr), + osmo_sockaddr_port((struct sockaddr*)&leg->base.addr)); + if (osmo_sockaddr_cmp((struct osmo_sockaddr *)&prev_addr, + (struct osmo_sockaddr *)&leg->base)) { LOGP(DSIP, LOGL_INFO, "re-INVITE changes media connection.\n"); if (other->update_rtp) other->update_rtp(leg->base.call->remote); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3b1bebbcc9e36be43d8d055c8d28cbb38ff21b37 Gerrit-Change-Number: 20052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 16:41:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 16:41:17 +0000 Subject: Change in osmo-msc[master]: WIP: mncc: Support IPv6 addresses (new version mncc 7) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20053 ) Change subject: WIP: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... WIP: mncc: Support IPv6 addresses (new version mncc 7) Change-Id: I6002b648bcb2055dcbbdae3f688f6e2cb7282b7f --- M include/osmocom/msc/mncc.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/mncc_call.c M src/libmsc/sdp_msg.c M tests/mncc/mncc_test.ok 5 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/20053/1 diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index cf7d7ce..1c8aff0 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -28,6 +28,7 @@ #include #include +#include struct gsm_network; struct msgb; @@ -170,7 +171,7 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 6 +#define MNCC_SOCK_VERSION 7 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; @@ -189,8 +190,7 @@ struct gsm_mncc_rtp { uint32_t msg_type; uint32_t callref; - uint32_t ip; - uint16_t port; + struct sockaddr_storage addr; uint32_t payload_type; uint32_t payload_msg_type; char sdp[1024]; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 8cfb611..d385c83 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1623,8 +1623,8 @@ rtp->callref = callref; rtp->msg_type = cmd; if (rtp_addr) { - rtp->ip = osmo_htonl(inet_addr(rtp_addr->ip)); - rtp->port = rtp_addr->port; + if (osmo_sockaddr_str_to_sockaddr(rtp_addr, &rtp->addr) < 0) + return -EINVAL; } rtp->payload_type = payload_type; rtp->payload_msg_type = payload_msg_type; @@ -1746,7 +1746,8 @@ return -EINVAL; } - osmo_sockaddr_str_from_32n(&rtp_addr, rtp->ip, rtp->port); + if (osmo_sockaddr_str_from_sockaddr(&rtp_addr, &rtp->addr) <0) + return -EINVAL; rtp_stream_set_remote_addr(rtps, &rtp_addr); rtp_stream_commit(rtps); return 0; diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c index 0deb903..9d52952 100644 --- a/src/libmsc/mncc_call.c +++ b/src/libmsc/mncc_call.c @@ -303,11 +303,10 @@ .rtp = { .msg_type = MNCC_RTP_CREATE, .callref = mncc_call->callref, - .port = rtp_local->port, }, }; - if (osmo_sockaddr_str_to_32n(rtp_local, &mncc_msg.rtp.ip)) { + if (osmo_sockaddr_str_to_sockaddr(rtp_local, &mncc_msg.rtp.addr)) { mncc_call_error(mncc_call, "Failed to compose IP address " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(rtp_local)); return false; @@ -332,7 +331,7 @@ return true; } - if (osmo_sockaddr_str_from_32n(&rtp, mncc_msg->ip, mncc_msg->port)) { + if (osmo_sockaddr_str_from_sockaddr(&rtp, &mncc_msg->addr)) { mncc_call_error(mncc_call, "Cannot RTP-CONNECT, invalid RTP IP:port in incoming MNCC message\n"); return false; } diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index cc54249..6170e8e 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -168,15 +168,16 @@ const struct sdp_audio_codec *codec; struct osmo_strbuf sb = { .buf = dst, .len = dst_size }; const char *ip = sdp->rtp.ip[0] ? sdp->rtp.ip : "0.0.0.0"; + char ipv = osmo_ip_str_type(ip) == AF_INET6 ? '6' : '4'; OSMO_STRBUF_PRINTF(sb, "v=0\r\n" - "o=OsmoMSC 0 0 IN IP4 %s\r\n" + "o=OsmoMSC 0 0 IN IP%c %s\r\n" "s=GSM Call\r\n" - "c=IN IP4 %s\r\n" + "c=IN IP%c %s\r\n" "t=0 0\r\n" "m=audio %d RTP/AVP", - ip, ip, + ipv, ip, ipv, ip, sdp->rtp.port); /* Append all payload type numbers to 'm=audio RTP/AVP 3 4 112' line */ diff --git a/tests/mncc/mncc_test.ok b/tests/mncc/mncc_test.ok index 807904d..9334706 100644 --- a/tests/mncc/mncc_test.ok +++ b/tests/mncc/mncc_test.ok @@ -12,12 +12,12 @@ len zero: len=0 sdplen=-834 sdp=- rc=-22 struct gsm_mncc_rtp: -empty SDP: len=1048 sdplen=1024 sdp="\0" rc=0 -empty SDP, shortest possible: len=25 sdplen=1 sdp="\0" rc=0 -empty SDP, zero len: len=24 sdplen=0 sdp=- rc=-22 -terminated SDP str: len=1048 sdplen=1024 sdp="Privacy is a desirable marketing option\0" rc=0 -terminated SDP str, shortest possible: len=64 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0 -terminated SDP str, but len excludes nul: len=63 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22 -terminated SDP str, but len too short: len=47 sdplen=23 sdp="Privacy is a desirable " rc=-22 -len way too short: len=10 sdplen=-14 sdp=- rc=-22 -len zero: len=0 sdplen=-24 sdp=- rc=-22 +empty SDP: len=1168 sdplen=1024 sdp="\0" rc=0 +empty SDP, shortest possible: len=145 sdplen=1 sdp="\0" rc=0 +empty SDP, zero len: len=144 sdplen=0 sdp=- rc=-22 +terminated SDP str: len=1168 sdplen=1024 sdp="Privacy is a desirable marketing option\0" rc=0 +terminated SDP str, shortest possible: len=184 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0 +terminated SDP str, but len excludes nul: len=183 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22 +terminated SDP str, but len too short: len=167 sdplen=23 sdp="Privacy is a desirable " rc=-22 +len way too short: len=10 sdplen=-134 sdp=- rc=-22 +len zero: len=0 sdplen=-144 sdp=- rc=-22 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6002b648bcb2055dcbbdae3f688f6e2cb7282b7f Gerrit-Change-Number: 20053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 16:44:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 16:44:01 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 to look at the new patch set (#2). Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... mncc: Support IPv6 addresses (new version mncc 7) Change-Id: I3b1bebbcc9e36be43d8d055c8d28cbb38ff21b37 --- M src/call.h M src/mncc.c M src/mncc_protocol.h M src/sdp.c M src/sip.c 5 files changed, 75 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/52/20052/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3b1bebbcc9e36be43d8d055c8d28cbb38ff21b37 Gerrit-Change-Number: 20052 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 16:48:54 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 9 Sep 2020 16:48:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... Patch Set 1: Code-Review+2 obscure but you win the argument -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 16:48:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 16:50:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 16:50:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix race condition waiting for RESET-ACK In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 ) Change subject: bsc: Fix race condition waiting for RESET-ACK ...................................................................... bsc: Fix race condition waiting for RESET-ACK This scenario appeared in jenkins runs of BSC_Tests making TC_ctrl_msc_connection_status fail (the first test in the suite). I could however not reproduce it on my local docker setup because it really seems like a timing race condition. The scenario is: TTCN3 -> BSC: RESET TTCN3 <- BSC: RESET TTCN3 -> BSC: RESET-ACK In there, TTCN3's f_legacy_bssap_reset() expected a RESET-ACK to be received, but it may well be that the other end never saw the RESET and hence it will never sent the RESET-ACK, since it indicated it became available afterwards. In that case (RESET received), let's not fail if a RESET-ACK is never received, since the connection is actually in the desired state and this scenario can happen and it's all fine. Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a --- M bsc/BSC_Tests.ttcn 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d32f202..4c45028 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -744,6 +744,7 @@ private function f_legacy_bssap_reset(integer bssap_idx := 0) runs on test_CT { var BSSAP_N_UNITDATA_ind ud_ind; + var boolean reset_received := false; timer T := 5.0; BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled))); @@ -757,10 +758,20 @@ log("Respoding to inbound RESET with RESET-ACK"); BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress, ts_BSSMAP_ResetAck(g_osmux_enabled))); + reset_received := true; repeat; } [] BSSAP.receive { repeat; } - [] T.timeout { setverdict(fail, "Waiting for RESET-ACK after sending RESET"); } + [] T.timeout { + log("Timeout waiting for RESET-ACK after sending RESET"); + /* If we received a RESET after ours was sent, it + may be a race condition where the other peer beacame + available after we sent it, but we are in a desired + state anyway, so go forward. */ + if (not reset_received) { + setverdict(fail); + } + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic92e0fb7033e5134b66e485a11371394adaba78a Gerrit-Change-Number: 19930 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 18:11:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 18:11:34 +0000 Subject: Change in mncc-python[master]: regen-mncc-py.sh: Document how to obtain required bins from source References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/mncc-python/+/20054 ) Change subject: regen-mncc-py.sh: Document how to obtain required bins from source ...................................................................... regen-mncc-py.sh: Document how to obtain required bins from source Change-Id: Ifc54ea883dd9f11bf6497e81eaa00bb6ddf50807 --- M regen-mncc-py.sh 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/54/20054/1 diff --git a/regen-mncc-py.sh b/regen-mncc-py.sh index f1c85db..a1981b4 100755 --- a/regen-mncc-py.sh +++ b/regen-mncc-py.sh @@ -3,14 +3,36 @@ echo Unfortunately, this package is long unmaintained and only available on Debian8 echo +# If your distro doesn't provide python-ctypeslib: +# svn co "https://svn.python.org/projects/ctypes/trunk/ctypeslib/" +# cd ctypeslib +# python2 ./setup.py install --prefix /tmp/out +# ln -s h2xml.py /tmp/out/bin/h2xml +# ln -s xml2py.py /tmp/out/bin/xml2py +# export PYTHONPATH="$PYTHONPATH:/tmp/out/lib/python2.7/site-packages" +# export PATH="$PATH:/tmp/out/bin/" +# ./regen-mncc-py.sh +# == Troubleshooting: +# * h2ml: Failing with tracebak OSError Not found: +# One may be missing gccxml. On arch, install gccxml-git from AUR. +# * h2xml failing due to missing gccxml_builtins.h: +# Create empty file /tmp/include/gccxml_builtins.h and pass "-I /tmp/include/" to h2xml. +# * Missing __builtin_bswap16/32/64: +# Copy from /usr/include/bits/byteswap.h defines __bswap_constant_16/32/64 to +# either start of mncc.h itself or /tmp/include/gccxml_builtins.h, and rename +# them as __builtin_bswap16/32/64. + if [ ! -x `which h2xml` ]; then echo No h2xml executable found - python-ctypeslib not installed? + exit 1 fi if [ ! -x `which xml2py` ]; then echo No xml2py executable found - python-ctypeslib not installed? + exit 1 fi +set -xe cp ./mncc.h /tmp/mncc.h -h2xml ./mncc.h -c -o mncc.xml +h2xml -I /tmp/include/ ./mncc.h -c -o mncc.xml xml2py mncc.xml -k dest -v -o mncc.py -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ifc54ea883dd9f11bf6497e81eaa00bb6ddf50807 Gerrit-Change-Number: 20054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 18:11:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 18:11:34 +0000 Subject: Change in mncc-python[master]: Update to MNCC v7 (Support IPv6 addresses) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/mncc-python/+/20055 ) Change subject: Update to MNCC v7 (Support IPv6 addresses) ...................................................................... Update to MNCC v7 (Support IPv6 addresses) Change-Id: Iab17f09380d7cd914cf85746b794c6c04ec7de43 --- M mncc.h M mncc.py M mncc.xml 3 files changed, 4,052 insertions(+), 1,197 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/55/20055/1 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Iab17f09380d7cd914cf85746b794c6c04ec7de43 Gerrit-Change-Number: 20055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 18:13:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 18:13:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 RTP streams in osmo-mgw In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 ) Change subject: mgw: Test IPv6 RTP streams in osmo-mgw ...................................................................... Patch Set 3: Code-Review+2 Merging in order to avoid some ttcn3-mgw tests falling tonight. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 Gerrit-Change-Number: 20039 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 18:13:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 18:13:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 18:13:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Test IPv6 RTP streams in osmo-mgw In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 ) Change subject: mgw: Test IPv6 RTP streams in osmo-mgw ...................................................................... mgw: Test IPv6 RTP streams in osmo-mgw Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 --- M mgw/MGCP_Test.ttcn 1 file changed, 83 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index b767dd4..4be034b 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -65,8 +65,10 @@ modulepar { PortNumber mp_local_udp_port := 2727; charstring mp_local_ipv4 := "127.0.0.1"; + charstring mp_local_ipv6 := "::1"; PortNumber mp_remote_udp_port := 2427; charstring mp_remote_ipv4 := "127.0.0.1"; + charstring mp_remote_ipv6 := "::1"; PortNumber mp_local_rtp_port_base := 10000; PortNumber mp_local_osmux_port := 1985; } @@ -1186,7 +1188,9 @@ return true; } - function f_TC_two_crcx_and_rtp_osmux(boolean bidir) runs on dummy_CT { + function f_TC_two_crcx_and_rtp_osmux(boolean bidir, + charstring local_ip_rtp, charstring remote_ip_rtp, + charstring local_ip_osmux, charstring remote_ip_osmux) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats_rtp; var OsmuxemStats stats_osmux; @@ -1198,7 +1202,7 @@ f_init(ep, true); /* from us to MGW */ - flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(local_ip_rtp, remote_ip_rtp, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1209,7 +1213,7 @@ f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]); /* from MGW back to us */ - flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; flow[1].osmux_cid := 2; flow[1].osmux_cfg := c_OsmuxemDefaultCfg; @@ -1254,17 +1258,37 @@ /* create one RTP and one OSmux emulations; create two connections on MGW EP, exchange some data */ testcase TC_two_crcx_and_rtp_osmux() runs on dummy_CT { - f_TC_two_crcx_and_rtp_osmux(false); + f_TC_two_crcx_and_rtp_osmux(false, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); } /* create one RTP and one OSmux emulations; create two connections on MGW EP, * exchange some data in both directions */ testcase TC_two_crcx_and_rtp_osmux_bidir() runs on dummy_CT { - f_TC_two_crcx_and_rtp_osmux(true); + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + + /* Same as TC_two_crcx_and_rtp_osmux_bidir, but using IPv6 */ + testcase TC_two_crcx_and_rtp_osmux_bidir_ipv6() runs on dummy_CT { + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_and_rtp_osmux_bidir, but using IPv4 (RTP) and IPv6 (Osmux) */ + testcase TC_two_crcx_and_rtp_osmux_bidir_ipv4_ipv6() runs on dummy_CT { + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_and_rtp_osmux_bidir, but using IPv6 (RTP) and IPv4 (Osmux) */ + testcase TC_two_crcx_and_rtp_osmux_bidir_ipv6_ipv4() runs on dummy_CT { + f_TC_two_crcx_and_rtp_osmux(true, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv4, mp_remote_ipv4); } - function f_two_crcx_mdcx_and_rtp_osmux(boolean crcx_osmux_wildcard) runs on dummy_CT { + function f_two_crcx_mdcx_and_rtp_osmux(boolean crcx_osmux_wildcard, + charstring local_ip_rtp, charstring remote_ip_rtp, + charstring local_ip_osmux, charstring remote_ip_osmux) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats_rtp; var OsmuxemStats stats_osmux; @@ -1277,7 +1301,7 @@ f_init(ep, true); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000")); + flow[0] := valueof(t_RtpFlow(local_ip_rtp, remote_ip_rtp, 112, "AMR/8000")); flow[0].rtp_cfg := c_RtpemDefaultCfg flow[0].rtp_cfg.tx_payload_type := flow[0].pt; /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */ @@ -1285,12 +1309,12 @@ flow[0].rtp_cfg.tx_fixed_payload := flow[0].rtp_cfg.rx_fixed_payload; /* bind local RTP emulation sockets */ flow[0].em.portnr := 10000; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], false); + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000")); + flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; if (crcx_osmux_wildcard) { flow[1].osmux_cid := -1; @@ -1298,7 +1322,7 @@ flow[1].osmux_cid := 2; } flow[1].osmux_cfg := c_OsmuxemDefaultCfg; - f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow[1], false); + f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow[1], true); /* The first leg starts transmitting */ @@ -1393,14 +1417,32 @@ directions. Create CRCX with wildcard Osmux CID and set it later during MDCX. This is similar to how MSC sets up the call in AoIP. */ testcase TC_two_crcx_mdcx_and_rtp_osmux_wildcard() runs on dummy_CT { - f_two_crcx_mdcx_and_rtp_osmux(true); + f_two_crcx_mdcx_and_rtp_osmux(true, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); } /* create one RTP and one OSmux emulations and pass data in both directions. Create CRCX with fixed Osmux CID and keep it during MDCX. This is similar to how BSC sets up the call in AoIP. */ testcase TC_two_crcx_mdcx_and_rtp_osmux_fixed() runs on dummy_CT { - f_two_crcx_mdcx_and_rtp_osmux(false); + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + + /* Same as TC_two_crcx_mdcx_and_rtp_osmux_wildcard, but using IPv6. */ + testcase TC_two_crcx_mdcx_and_rtp_osmux_ipv6() runs on dummy_CT { + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_mdcx_and_rtp_osmux_wildcard, but using IPv4 (RTP) and IPv6 (Osmux). */ + testcase TC_two_crcx_mdcx_and_rtp_osmux_ipv4_ipv6() runs on dummy_CT { + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv6, mp_remote_ipv6); + } + /* Same as TC_two_crcx_mdcx_and_rtp_osmux_wildcard, but using IPv6 (RTP) and IPv4 (Osmux). */ + testcase TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4() runs on dummy_CT { + f_two_crcx_mdcx_and_rtp_osmux(false, mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv4, mp_remote_ipv4); } function f_crcx_and_dlcx_ep_callid_connid(MgcpEndpoint ep, MgcpCallId call_id) runs on dummy_CT { @@ -1727,7 +1769,8 @@ } /* create two local RTP emulations and pass data in both directions */ - testcase TC_two_crcx_mdcx_and_rtp() runs on dummy_CT { + function f_tc_two_crcx_mdcx_and_rtp(charstring local_ip_a, charstring remote_ip_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; var MgcpResponse resp; @@ -1739,15 +1782,15 @@ f_init(ep); /* Create the first connection in receive only mode */ - flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 3, "GSM/8000/1")); flow[0].em.portnr := 10000; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], false); + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); /* Create the second connection. This connection will be also * in receive only mode */ - flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1")); + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 3, "GSM/8000/1")); flow[1].em.portnr := 20000; - f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], false); + f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); /* The first leg starts transmitting */ f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); @@ -1828,6 +1871,21 @@ setverdict(pass); } + testcase TC_two_crcx_mdcx_and_rtp() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_rtp(mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + + testcase TC_two_crcx_mdcx_and_rtp_ipv6() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_rtp(mp_local_ipv6, mp_remote_ipv6, + mp_local_ipv6, mp_remote_ipv6); + } + + testcase TC_two_crcx_mdcx_and_rtp_ipv4_ipv6() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_rtp(mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv6, mp_remote_ipv6); + } + /* Test what happens when two RTP streams from different sources target * a single connection. Is the unsolicited stream properly ignored? */ testcase TC_two_crcx_and_unsolicited_rtp() runs on dummy_CT { @@ -2358,5 +2416,13 @@ execute(TC_crcx_mdcx_ip4()); execute(TC_crcx_mdcx_ip6()); + execute(TC_two_crcx_mdcx_and_rtp_ipv4_ipv6()); + execute(TC_two_crcx_mdcx_and_rtp_ipv6()); + execute(TC_two_crcx_and_rtp_osmux_bidir_ipv6()); + execute(TC_two_crcx_and_rtp_osmux_bidir_ipv4_ipv6()); + execute(TC_two_crcx_and_rtp_osmux_bidir_ipv6_ipv4()); + execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6()); + execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv4_ipv6()); + execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2a47926757af84ffa190a954aac0dcc5369528b3 Gerrit-Change-Number: 20039 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 18:58:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 18:58:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: mncc: Support IPv6 addresses (new version mncc 7) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 ) Change subject: WIP: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... WIP: mncc: Support IPv6 addresses (new version mncc 7) Apparently commit 06b859ca314f53a902329ed95848dbafef1d4f87 forgot to bump the MNCC_SOCK_VERSION field from 5 to 6 in TODO: check what about MNCC_Emulation.mp_mncc_version TODO: Add IPv6 tests for sip/SIP_Tests Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b --- M library/MNCC_Emulation.ttcn M library/MNCC_EncDec.cc M library/MNCC_Types.ttcn M library/mncc.h 4 files changed, 47 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/20056/1 diff --git a/library/MNCC_Emulation.ttcn b/library/MNCC_Emulation.ttcn index be087ec..13a842b 100644 --- a/library/MNCC_Emulation.ttcn +++ b/library/MNCC_Emulation.ttcn @@ -38,7 +38,7 @@ import from UD_Types all; modulepar { - int mp_mncc_version := 6; + int mp_mncc_version := 7; } /* General "base class" component definition, of which specific implementations diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc index f2692d7..d9529ee 100644 --- a/library/MNCC_EncDec.cc +++ b/library/MNCC_EncDec.cc @@ -188,8 +188,20 @@ memset(&rtp, 0, sizeof(rtp)); rtp.msg_type = in.msg__type(); rtp.callref = in.u().rtp().callref(); - rtp.ip = in.u().rtp().ip(); - rtp.port = in.u().rtp().rtp__port(); + if (in.u().rtp().is__ipv6()) { + rtp.addr.ss_family = AF_INET6; + ((struct sockaddr_in6*)&rtp.addr)->sin6_port = in.u().rtp().rtp__port(); + //TODO: verify octetstring len + memcpy(((struct sockaddr_in6*)&rtp.addr)->sin6_addr, in.u().rtp().ip().data(), + sizeof(struct in6_addr)); + } else { + rtp.addr.ss_family = AF_INET; + ((struct sockaddr_in*)&rtp.addr)->sin_port = in.u().rtp().rtp__port(); + //TODO: verify octetstring len + memcpy(((struct sockaddr_in*)&rtp.addr)->sin_addr, in.u().rtp().ip().data(), + sizeof(struct in_addr)); + //rtp.ip = in.u().rtp().ip(); + } rtp.payload_type = in.u().rtp().payload__type(); rtp.payload_msg_type = in.u().rtp().payload__msg__type(); ret_val = OCTETSTRING(sizeof(rtp), (uint8_t *) &rtp); @@ -224,6 +236,9 @@ const struct gsm_mncc_rtp *in_rtp; MNCC__PDU__Rtp rtp; MNCC__MsgUnion u; + bool is_ipv6; + OCTETSTRING ip; + uint16_t port; in_mncc = (struct gsm_mncc *) ttcn_buffer.get_read_data(); @@ -258,7 +273,20 @@ case MNCC_RTP_CONNECT: case MNCC_RTP_FREE: in_rtp = (const struct gsm_mncc_rtp *) in_mncc; - rtp = MNCC__PDU__Rtp(in_rtp->callref, in_rtp->ip, in_rtp->port, in_rtp->payload_type, + switch (in_rtp->addr.ss_family) { + case AF_INET: + is_ipv6 = false; + port = ((struct sockaddr_in*)&in_rtp->addr)->sin_port; + ip = OCTETSTRING(sizeof(struct in_addr), &(struct sockaddr_in*)&in_rtp->addr)->sin_addr); + break; + case AF_INET6: + is_ipv6 = true; + port = ((struct sockaddr_in6*)&in_rtp->addr)->sin6_port; + ip = OCTETSTRING(sizeof(struct in6_addr), &(struct sockaddr_in6*)&in_rtp->addr)->sin6_addr); + + break; + } + rtp = MNCC__PDU__Rtp(in_rtp->callref, is_ipv6, ip, port, in_rtp->payload_type, in_rtp->payload_msg_type, in_rtp->sdp); u.rtp() = rtp; break; diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index 0a8e7d9..fa4fc3e 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -373,7 +373,8 @@ type record MNCC_PDU_Rtp { uint32_t callref, - uint32_t ip, + boolean is_ipv6, + octetstring ip, //TODO: define size of octetstring based on is_ipv6 using CROSSTAGS? uint16_t rtp_port, uint32_t payload_type, uint32_t payload_msg_type, @@ -1921,7 +1922,8 @@ u := { rtp := { callref := call_id, - ip := 0, + is_ipv6 := false, + ip := '00000000'O, rtp_port := 0, payload_type := 0, payload_msg_type := 0, @@ -1935,13 +1937,14 @@ /* MSC -> MNCC: RTP_CREATE.rsp; acknowledge creation of RTP (stating MSC side IP/Port) */ template MNCC_PDU tr_MNCC_RTP_CREATE(template uint32_t call_id := ?, - template uint32_t ip := ?, - template uint32_t rtp_port := ?, + template octetstring ip := ?, + template uint16_t rtp_port := ?, template uint32_t payload_type := ?) := { msg_type := MNCC_RTP_CREATE, u := { rtp := { callref := call_id, + is_ipv6 := false, ip := ip, rtp_port := rtp_port, payload_type := payload_type, @@ -1952,11 +1955,12 @@ } /* MSC <- MNCC: RTP_CONNECT.req; request connect of RTP */ -template MNCC_PDU ts_MNCC_RTP_CONNECT(uint32_t call_id, uint32_t ip, uint32_t rtp_port, uint32_t pt) := { +template MNCC_PDU ts_MNCC_RTP_CONNECT(uint32_t call_id, octetstring ip, uint16_t rtp_port, uint32_t pt) := { msg_type := MNCC_RTP_CONNECT, u := { rtp := { callref := call_id, + is_ipv6 := false, ip := ip, rtp_port := rtp_port, payload_type := pt, @@ -1966,13 +1970,14 @@ } } template MNCC_PDU tr_MNCC_RTP_CONNECT(template uint32_t call_id, - template uint32_t ip := ?, - template uint32_t rtp_port := ?, + template octetstring ip := ?, + template uint16_t rtp_port := ?, template uint32_t pt := ?) := { msg_type := MNCC_RTP_CONNECT, u := { rtp := { callref := call_id, + is_ipv6 := false, ip := ip, rtp_port := rtp_port, payload_type := pt, diff --git a/library/mncc.h b/library/mncc.h index 9aff948..1e45c37 100644 --- a/library/mncc.h +++ b/library/mncc.h @@ -5,6 +5,7 @@ */ #include +#include /* GSM 04.08 Bearer Capability: Rate Adaption */ enum gsm48_bcap_ra { @@ -275,7 +276,7 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 5 +#define MNCC_SOCK_VERSION 7 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; @@ -294,8 +295,7 @@ struct gsm_mncc_rtp { uint32_t msg_type; uint32_t callref; - uint32_t ip; - uint16_t port; + struct sockaddr_storage addr; uint32_t payload_type; uint32_t payload_msg_type; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b Gerrit-Change-Number: 20056 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 19:00:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 9 Sep 2020 19:00:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 ) Change subject: WIP: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056/1/library/MNCC_EncDec.cc File library/MNCC_EncDec.cc: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056/1/library/MNCC_EncDec.cc at 195 PS1, Line 195: memcpy(((struct sockaddr_in6*)&rtp.addr)->sin6_addr, in.u().rtp().ip().data(), I still need to figure out how to get a memory buffer point out of an octetstring here, from ip(). https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056/1/library/MNCC_Types.ttcn File library/MNCC_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056/1/library/MNCC_Types.ttcn at 377 PS1, Line 377: octetstring ip, //TODO: define size of octetstring based on is_ipv6 using CROSSTAGS? something like: if is_ipv6 LERNGTHOF(ip = 16), if not is_ipv6 LENGTHOF(ip = 4). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b Gerrit-Change-Number: 20056 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Sep 2020 19:00:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 9 22:35:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 9 Sep 2020 22:35:56 +0000 Subject: Change in osmo-bsc[master]: gsm_data: always set spare bits in channel description References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20057 ) Change subject: gsm_data: always set spare bits in channel description ...................................................................... gsm_data: always set spare bits in channel description The spare bits were never encoded even when the spec says it must be 00. Most caller of _chan_desc_fill_tail() initialized the struct with memset(), but not all. The SI4 did not initialized it. Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/20057/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index c0c8cf6..fbc2ae2 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -601,6 +601,7 @@ uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; cd->h0.tsc = gsm_ts_tsc(lchan->ts); cd->h0.h = 0; + cd->h0.spare = 0; cd->h0.arfcn_high = arfcn >> 8; cd->h0.arfcn_low = arfcn & 0xff; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c Gerrit-Change-Number: 20057 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 01:21:15 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 10 Sep 2020 01:21:15 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: reset the device on usb reset if it was previously running References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20058 ) Change subject: usb: reset the device on usb reset if it was previously running ...................................................................... usb: reset the device on usb reset if it was previously running Usb init order is desc read -> reset-> set addr -> use device. DADD.ADDEN is automatically cleared upon receiving a reset from the host, at least according to the SAMD51 manual, but DADD.DADD is zero as well (?) so it can't be used to check if usb was previously running and the cable was pulled out and plugged in again while the device was externally powered. This works around this and ensures a device reset from the host leads to a proper device restart and reinitialization in this case, there is no state we want to keep in this case anyway. Change-Id: I692de3dd98cfc30a010b457be87331e482632fb7 Closes: SYS#4908 --- M sysmoOCTSIM/hpl/usb/hpl_usb.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/58/20058/1 diff --git a/sysmoOCTSIM/hpl/usb/hpl_usb.c b/sysmoOCTSIM/hpl/usb/hpl_usb.c index eec9728..99e4606 100644 --- a/sysmoOCTSIM/hpl/usb/hpl_usb.c +++ b/sysmoOCTSIM/hpl/usb/hpl_usb.c @@ -39,6 +39,11 @@ #include #include #include +#include + +/* save previous setup state to allow device reset when receving usb reset after the device + * was previously properly configured, i.e. when powered externally and usb is disconnected and reconnected */ +volatile bool address_was_set = false; /** * \brief Dummy callback function @@ -974,6 +979,17 @@ hri_usbdevice_set_INTEN_reg(USB, USB_D_SUSPEND_INT_FLAGS); _usb_d_dev_reset_epts(); + + if(address_was_set == true) { + _usb_d_dev_detach(); + address_was_set = 0; + delay_ms(100); + __disable_irq(); + __DMB(); + __DSB(); + NVIC_SystemReset(); + } + dev_inst.callbacks.event(USB_EV_RESET, 0); } @@ -1579,6 +1595,7 @@ void _usb_d_dev_set_address(uint8_t addr) { hri_usbdevice_write_DADD_reg(USB, USB_DEVICE_DADD_ADDEN | USB_DEVICE_DADD_DADD(addr)); + address_was_set = true; } uint8_t _usb_d_dev_get_address(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I692de3dd98cfc30a010b457be87331e482632fb7 Gerrit-Change-Number: 20058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 10 01:54:58 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 Sep 2020 01:54:58 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f59878971c39_74802add79ac65f810186d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 433s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 433s] [COMPILING libboard/qmod/source/card_pres.c] [ 434s] [COMPILING libboard/qmod/source/wwan_led.c] [ 434s] [COMPILING libboard/qmod/source/i2c.c] [ 434s] [COMPILING libboard/qmod/source/board_qmod.c] [ 435s] [COMPILING apps/dfu/main.c] [ 435s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 435s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 435s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 436s] Memory region Used Size Region Size %age Used [ 436s] rom: 16588 B 16 KB 101.25% [ 436s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 436s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 436s] collect2: error: ld returned 1 exit status [ 436s] % [ 436s] make[2]: *** [Makefile:234: flash] Error 1 [ 436s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 436s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 436s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 436s] dh_auto_build: error: make -j1 returned exit code 2 [ 436s] make: *** [debian/rules:16: build] Error 25 [ 436s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 436s] ### VM INTERACTION START ### [ 439s] [ 408.605573] sysrq: Power Off [ 439s] [ 408.646189] reboot: Power down [ 439s] ### VM INTERACTION END ### [ 439s] [ 439s] lamb53 failed "build simtrace2_0.7.0.63.39070.dsc" at Thu Sep 10 01:54:40 UTC 2020. [ 439s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Sep 10 06:16:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 10 Sep 2020 06:16:43 +0000 Subject: Change in osmo-bsc[master]: gsm_data: always set spare bits in channel description In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20057 ) Change subject: gsm_data: always set spare bits in channel description ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Hmm, I am now wondering whether ASAN can detect uninitialized bit-field access. https://gerrit.osmocom.org/c/osmo-bsc/+/20057/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/20057/1//COMMIT_MSG at 12 PS1, Line 12: initialized initialize -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c Gerrit-Change-Number: 20057 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 10 Sep 2020 06:16:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 06:46:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 10 Sep 2020 06:46:57 +0000 Subject: Change in mncc-python[master]: regen-mncc-py.sh: Document how to obtain required bins from source In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/20054 ) Change subject: regen-mncc-py.sh: Document how to obtain required bins from source ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ifc54ea883dd9f11bf6497e81eaa00bb6ddf50807 Gerrit-Change-Number: 20054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 06:46:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 06:54:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 10 Sep 2020 06:54:28 +0000 Subject: Change in mncc-python[master]: Update to MNCC v7 (Support IPv6 addresses) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/20055 ) Change subject: Update to MNCC v7 (Support IPv6 addresses) ...................................................................... Patch Set 1: Code-Review+1 Uhhh, we should just start using pycrate or scapy some day... -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Iab17f09380d7cd914cf85746b794c6c04ec7de43 Gerrit-Change-Number: 20055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 06:54:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 07:16:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 10 Sep 2020 07:16:51 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20059 ) Change subject: osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() ...................................................................... osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() Change-Id: Ifa453e101c32ee211844becf4604f3e08198da73 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/59/20059/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 33a37b3..e4721ba 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -396,13 +396,14 @@ trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); } } else { - LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s\n", + LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s%s\n", l1h->config.enabled ? "" :" enable", pinst->phy_link->u.osmotrx.use_legacy_setbsic ? (l1h->config.bsic_valid ? (l1h->config.bsic_acked ? "" : " bsic-ack") : " bsic") : (l1h->config.tsc_valid ? (l1h->config.tsc_acked ? "" : " tsc-ack") : " tsc"), l1h->config.arfcn_valid ? "" : " arfcn", l1h->config.rxtune_acked ? "" : " rxtune-ack", + l1h->config.txtune_acked ? "" : " txtune-ack", l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"), l1h->config.setformat_acked ? "" : " setformat-ack", (l1h->phy_inst->num != 0 || others_ready) ? "" : " other-trx" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifa453e101c32ee211844becf4604f3e08198da73 Gerrit-Change-Number: 20059 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 07:29:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 07:29:59 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: reset the device on usb reset if it was previously running In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20058 ) Change subject: usb: reset the device on usb reset if it was previously running ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I692de3dd98cfc30a010b457be87331e482632fb7 Gerrit-Change-Number: 20058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 10 Sep 2020 07:29:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 07:30:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 07:30:02 +0000 Subject: Change in osmo-ccid-firmware[master]: usb: reset the device on usb reset if it was previously running In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20058 ) Change subject: usb: reset the device on usb reset if it was previously running ...................................................................... usb: reset the device on usb reset if it was previously running Usb init order is desc read -> reset-> set addr -> use device. DADD.ADDEN is automatically cleared upon receiving a reset from the host, at least according to the SAMD51 manual, but DADD.DADD is zero as well (?) so it can't be used to check if usb was previously running and the cable was pulled out and plugged in again while the device was externally powered. This works around this and ensures a device reset from the host leads to a proper device restart and reinitialization in this case, there is no state we want to keep in this case anyway. Change-Id: I692de3dd98cfc30a010b457be87331e482632fb7 Closes: SYS#4908 --- M sysmoOCTSIM/hpl/usb/hpl_usb.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/hpl/usb/hpl_usb.c b/sysmoOCTSIM/hpl/usb/hpl_usb.c index eec9728..99e4606 100644 --- a/sysmoOCTSIM/hpl/usb/hpl_usb.c +++ b/sysmoOCTSIM/hpl/usb/hpl_usb.c @@ -39,6 +39,11 @@ #include #include #include +#include + +/* save previous setup state to allow device reset when receving usb reset after the device + * was previously properly configured, i.e. when powered externally and usb is disconnected and reconnected */ +volatile bool address_was_set = false; /** * \brief Dummy callback function @@ -974,6 +979,17 @@ hri_usbdevice_set_INTEN_reg(USB, USB_D_SUSPEND_INT_FLAGS); _usb_d_dev_reset_epts(); + + if(address_was_set == true) { + _usb_d_dev_detach(); + address_was_set = 0; + delay_ms(100); + __disable_irq(); + __DMB(); + __DSB(); + NVIC_SystemReset(); + } + dev_inst.callbacks.event(USB_EV_RESET, 0); } @@ -1579,6 +1595,7 @@ void _usb_d_dev_set_address(uint8_t addr) { hri_usbdevice_write_DADD_reg(USB, USB_DEVICE_DADD_ADDEN | USB_DEVICE_DADD_DADD(addr)); + address_was_set = true; } uint8_t _usb_d_dev_get_address(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I692de3dd98cfc30a010b457be87331e482632fb7 Gerrit-Change-Number: 20058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:41:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:41:21 +0000 Subject: Change in mncc-python[master]: regen-mncc-py.sh: Document how to obtain required bins from source In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/20054 ) Change subject: regen-mncc-py.sh: Document how to obtain required bins from source ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ifc54ea883dd9f11bf6497e81eaa00bb6ddf50807 Gerrit-Change-Number: 20054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 08:41:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:42:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:42:45 +0000 Subject: Change in mncc-python[master]: Update to MNCC v7 (Support IPv6 addresses) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/20055 ) Change subject: Update to MNCC v7 (Support IPv6 addresses) ...................................................................... Patch Set 1: Code-Review+2 > Uhhh, we should just start using pycrate or scapy some day... well, if you have the tools installed, the python code is generated automatically from the C header, actually quite comfortable. Both pycrate and scapy require you to again type in the definition of the messages, introducing possible incompatibilities between the C headers and that definition... -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Iab17f09380d7cd914cf85746b794c6c04ec7de43 Gerrit-Change-Number: 20055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 08:42:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:42:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:42:59 +0000 Subject: Change in mncc-python[master]: Update to MNCC v7 (Support IPv6 addresses) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/20055 ) Change subject: Update to MNCC v7 (Support IPv6 addresses) ...................................................................... Patch Set 1: again no OS# ticket number? -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Iab17f09380d7cd914cf85746b794c6c04ec7de43 Gerrit-Change-Number: 20055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 08:42:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:43:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:43:19 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20059 ) Change subject: osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifa453e101c32ee211844becf4604f3e08198da73 Gerrit-Change-Number: 20059 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 10 Sep 2020 08:43:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:43:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:43:22 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20059 ) Change subject: osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() ...................................................................... osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() Change-Id: Ifa453e101c32ee211844becf4604f3e08198da73 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 33a37b3..e4721ba 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -396,13 +396,14 @@ trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); } } else { - LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s\n", + LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s%s\n", l1h->config.enabled ? "" :" enable", pinst->phy_link->u.osmotrx.use_legacy_setbsic ? (l1h->config.bsic_valid ? (l1h->config.bsic_acked ? "" : " bsic-ack") : " bsic") : (l1h->config.tsc_valid ? (l1h->config.tsc_acked ? "" : " tsc-ack") : " tsc"), l1h->config.arfcn_valid ? "" : " arfcn", l1h->config.rxtune_acked ? "" : " rxtune-ack", + l1h->config.txtune_acked ? "" : " txtune-ack", l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"), l1h->config.setformat_acked ? "" : " setformat-ack", (l1h->phy_inst->num != 0 || others_ready) ? "" : " other-trx" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifa453e101c32ee211844becf4604f3e08198da73 Gerrit-Change-Number: 20059 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:43:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:43:52 +0000 Subject: Change in osmo-bsc[master]: gsm_data: always set spare bits in channel description In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20057 ) Change subject: gsm_data: always set spare bits in channel description ...................................................................... gsm_data: always set spare bits in channel description The spare bits were never encoded even when the spec says it must be 00. Most caller of _chan_desc_fill_tail() initialized the struct with memset(), but not all. The SI4 did not initialize it. Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/20057/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c Gerrit-Change-Number: 20057 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:43:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:43:57 +0000 Subject: Change in osmo-bsc[master]: gsm_data: always set spare bits in channel description In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20057 ) Change subject: gsm_data: always set spare bits in channel description ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c Gerrit-Change-Number: 20057 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 10 Sep 2020 08:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:43:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:43:59 +0000 Subject: Change in osmo-bsc[master]: gsm_data: always set spare bits in channel description In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20057 ) Change subject: gsm_data: always set spare bits in channel description ...................................................................... gsm_data: always set spare bits in channel description The spare bits were never encoded even when the spec says it must be 00. Most caller of _chan_desc_fill_tail() initialized the struct with memset(), but not all. The SI4 did not initialize it. Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index c0c8cf6..fbc2ae2 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -601,6 +601,7 @@ uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; cd->h0.tsc = gsm_ts_tsc(lchan->ts); cd->h0.h = 0; + cd->h0.spare = 0; cd->h0.arfcn_high = arfcn >> 8; cd->h0.arfcn_low = arfcn & 0xff; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib03d6d2cdadc49e49aa94917d17f81ef3c83f11c Gerrit-Change-Number: 20057 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:44:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:44:11 +0000 Subject: Change in mncc-python[master]: regen-mncc-py.sh: Document how to obtain required bins from source In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/mncc-python/+/20054 ) Change subject: regen-mncc-py.sh: Document how to obtain required bins from source ...................................................................... regen-mncc-py.sh: Document how to obtain required bins from source Change-Id: Ifc54ea883dd9f11bf6497e81eaa00bb6ddf50807 --- M regen-mncc-py.sh 1 file changed, 23 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, approved; Verified diff --git a/regen-mncc-py.sh b/regen-mncc-py.sh index f1c85db..a1981b4 100755 --- a/regen-mncc-py.sh +++ b/regen-mncc-py.sh @@ -3,14 +3,36 @@ echo Unfortunately, this package is long unmaintained and only available on Debian8 echo +# If your distro doesn't provide python-ctypeslib: +# svn co "https://svn.python.org/projects/ctypes/trunk/ctypeslib/" +# cd ctypeslib +# python2 ./setup.py install --prefix /tmp/out +# ln -s h2xml.py /tmp/out/bin/h2xml +# ln -s xml2py.py /tmp/out/bin/xml2py +# export PYTHONPATH="$PYTHONPATH:/tmp/out/lib/python2.7/site-packages" +# export PATH="$PATH:/tmp/out/bin/" +# ./regen-mncc-py.sh +# == Troubleshooting: +# * h2ml: Failing with tracebak OSError Not found: +# One may be missing gccxml. On arch, install gccxml-git from AUR. +# * h2xml failing due to missing gccxml_builtins.h: +# Create empty file /tmp/include/gccxml_builtins.h and pass "-I /tmp/include/" to h2xml. +# * Missing __builtin_bswap16/32/64: +# Copy from /usr/include/bits/byteswap.h defines __bswap_constant_16/32/64 to +# either start of mncc.h itself or /tmp/include/gccxml_builtins.h, and rename +# them as __builtin_bswap16/32/64. + if [ ! -x `which h2xml` ]; then echo No h2xml executable found - python-ctypeslib not installed? + exit 1 fi if [ ! -x `which xml2py` ]; then echo No xml2py executable found - python-ctypeslib not installed? + exit 1 fi +set -xe cp ./mncc.h /tmp/mncc.h -h2xml ./mncc.h -c -o mncc.xml +h2xml -I /tmp/include/ ./mncc.h -c -o mncc.xml xml2py mncc.xml -k dest -v -o mncc.py -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ifc54ea883dd9f11bf6497e81eaa00bb6ddf50807 Gerrit-Change-Number: 20054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 08:44:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 10 Sep 2020 08:44:33 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Removed Code-Review-1 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 09:23:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 09:23:43 +0000 Subject: Change in mncc-python[master]: Update to MNCC v7 (Support IPv6 addresses) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/20055 ) Change subject: Update to MNCC v7 (Support IPv6 addresses) ...................................................................... Patch Set 1: > again no OS# ticket number? well there's only a SYS ticket and it's basically about adding IPv6 almost everywhere, so I don't think it's of much use here... -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/20055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Iab17f09380d7cd914cf85746b794c6c04ec7de43 Gerrit-Change-Number: 20055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 09:23:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 11:28:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 10 Sep 2020 11:28:46 +0000 Subject: Change in osmo-pcu[master]: encoding: fix gen_freq_params(): do not check pdch twice References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20060 ) Change subject: encoding: fix gen_freq_params(): do not check pdch twice ...................................................................... encoding: fix gen_freq_params(): do not check pdch twice This is a left-over from an earlier version of [1] that makes Coverity think that there can be NULL pointer dereference, even despite we assert(pdch != NULL). [1] I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Change-Id: I3490c38e0c1186dfd2fae63526a05c694547cebb Fixes: CID#214230 --- M src/encoding.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/20060/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index ecf40de..d581fe9 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -565,7 +565,7 @@ freq_params->TSC = pdch->tsc; /* If frequency hopping is not in use, encode a single ARFCN */ - if (pdch == NULL || !pdch->fh.enabled) { + if (!pdch->fh.enabled) { freq_params->UnionType = 0x00; freq_params->u.ARFCN = tbf->trx->arfcn; return; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3490c38e0c1186dfd2fae63526a05c694547cebb Gerrit-Change-Number: 20060 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 11:38:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 11:38:05 +0000 Subject: Change in osmo-pcu[master]: encoding: fix gen_freq_params(): do not check pdch twice In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20060 ) Change subject: encoding: fix gen_freq_params(): do not check pdch twice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3490c38e0c1186dfd2fae63526a05c694547cebb Gerrit-Change-Number: 20060 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 11:38:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 15:31:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 15:31:08 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 to look at the new patch set (#3). Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... mncc: Support IPv6 addresses (new version mncc 7) Change-Id: I3b1bebbcc9e36be43d8d055c8d28cbb38ff21b37 --- M src/call.h M src/mncc.c M src/mncc_protocol.h M src/sdp.c M src/sip.c 5 files changed, 75 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/52/20052/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3b1bebbcc9e36be43d8d055c8d28cbb38ff21b37 Gerrit-Change-Number: 20052 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 15:31:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 15:31:32 +0000 Subject: Change in osmo-msc[master]: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/20053 to look at the new patch set (#2). Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... mncc: Support IPv6 addresses (new version mncc 7) Change-Id: I6002b648bcb2055dcbbdae3f688f6e2cb7282b7f --- M include/osmocom/msc/mncc.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/mncc_call.c M src/libmsc/sdp_msg.c M tests/mncc/mncc_test.ok 5 files changed, 28 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/20053/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6002b648bcb2055dcbbdae3f688f6e2cb7282b7f Gerrit-Change-Number: 20053 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 15:32:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 15:32:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 to look at the new patch set (#2). Change subject: WIP: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... WIP: mncc: Support IPv6 addresses (new version mncc 7) Apparently commit 06b859ca314f53a902329ed95848dbafef1d4f87 forgot to bump the MNCC_SOCK_VERSION field from 5 to 6. Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b --- M library/MNCC_Emulation.ttcn M library/MNCC_EncDec.cc M library/MNCC_Types.ttcn M library/mncc.h M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M sip/SIP_Tests.default 7 files changed, 85 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/20056/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b Gerrit-Change-Number: 20056 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 15:32:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 15:32:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 to look at the new patch set (#3). Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... mncc: Support IPv6 addresses (new version mncc 7) Apparently commit 06b859ca314f53a902329ed95848dbafef1d4f87 forgot to bump the MNCC_SOCK_VERSION field from 5 to 6. Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b --- M library/MNCC_Emulation.ttcn M library/MNCC_EncDec.cc M library/MNCC_Types.ttcn M library/mncc.h M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M sip/SIP_Tests.default 7 files changed, 85 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/20056/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b Gerrit-Change-Number: 20056 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 15:34:47 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 10 Sep 2020 15:34:47 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 ) Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... Patch Set 3: Code-Review+1 Manually Tested.. Looks good. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/20052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3b1bebbcc9e36be43d8d055c8d28cbb38ff21b37 Gerrit-Change-Number: 20052 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Comment-Date: Thu, 10 Sep 2020 15:34:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 10 16:08:46 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 Sep 2020 16:08:46 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5a4f91a983d_74802add79ac65f8313957@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 396s] [612/642] installing dbus-user-session-1.12.20-1 [ 396s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 396s] Processing triggers for libc-bin (2.31-3) ... [ 396s] [614/642] installing texlive-xetex-2020.20200804-2 [ 397s] Processing triggers for tex-common (6.15) ... [ 398s] Running mktexlsr. This may take some time... done. [ 398s] Building format(s) --all. [ 427s] This may take some time... done. [ 427s] Processing triggers for man-db (2.9.3-2) ... [ 427s] [615/642] installing dblatex-0.3.11py3-1 [ 428s] Processing triggers for man-db (2.9.3-2) ... [ 428s] Processing triggers for tex-common (6.15) ... [ 428s] Running mktexlsr. This may take some time... done. [ 429s] Processing triggers for sgml-base (1.30) ... [ 429s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 429s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 429s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 429s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 429s] Processing triggers for man-db (2.9.3-2) ... [ 430s] Errors were encountered while processing: [ 430s] libopenmpi-dev:amd64 [ 430s] exit ... [ 430s] ### VM INTERACTION START ### [ 431s] Powering off. [ 431s] [ 388.932346] reboot: Power down [ 431s] ### VM INTERACTION END ### [ 431s] [ 431s] cloud108 failed "build osmo-trx_1.2.0.dsc" at Thu Sep 10 16:08:39 UTC 2020. [ 431s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Sep 10 16:09:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 16:09:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Validate RTP addr+port passed from MNCC to MGCP MDCX References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20061 ) Change subject: msc: Validate RTP addr+port passed from MNCC to MGCP MDCX ...................................................................... msc: Validate RTP addr+port passed from MNCC to MGCP MDCX Change-Id: I0b53643ed3a8f8550b2ea6e8832068d603a676e1 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/20061/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 9218c76..6ea4f86 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1022,14 +1022,28 @@ /* MDCX setting up the CN side remote RTP address received from MNCC CONNECT */ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { + var SDP_Message sdp; log("f_mt_call_complete 9"); - var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, - hex2str(cpars.mgcp_call_id), "42", - cpars.mgw_conn_2.mgw_rtp_port, - { int2str(cpars.rtp_payload_type) }, - { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, - cpars.rtp_sdp_format)), - valueof(ts_SDP_ptime(20)) })); + + if (isvalue(mgcp_cmd.sdp)) { + sdp := mgcp_cmd.sdp; + if (sdp.media_list[0].media_field.ports.port_number != cpars.mncc_rtp_port) { + setverdict(fail, "Wrong MDCX Connection port received, expected ", cpars.mncc_rtp_port, " and received ", sdp.media_list[0].media_field.ports.port_number) + mtc.stop; + } + if (sdp.connection.conn_addr.addr != cpars.mncc_rtp_ip) { + setverdict(fail, "Wrong MDCX Connection address received, expected ", cpars.mncc_rtp_ip, " and received ", sdp.connection.conn_addr.addr) + mtc.stop; + } + } + + sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip, + hex2str(cpars.mgcp_call_id), "42", + cpars.mgw_conn_2.mgw_rtp_port, + { int2str(cpars.rtp_payload_type) }, + { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type, + cpars.rtp_sdp_format)), + valueof(ts_SDP_ptime(20)) })); MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0b53643ed3a8f8550b2ea6e8832068d603a676e1 Gerrit-Change-Number: 20061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 10 16:10:28 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 Sep 2020 16:10:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5a500b7414_74802add79ac65f83146db@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 514s] [612/642] installing dbus-user-session-1.12.20-1 [ 514s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 515s] Processing triggers for libc-bin (2.31-3) ... [ 515s] [614/642] installing texlive-xetex-2020.20200804-2 [ 516s] Processing triggers for tex-common (6.15) ... [ 516s] Running mktexlsr. This may take some time... done. [ 516s] Building format(s) --all. [ 543s] This may take some time... done. [ 543s] Processing triggers for man-db (2.9.3-2) ... [ 543s] [615/642] installing dblatex-0.3.11py3-1 [ 544s] Processing triggers for man-db (2.9.3-2) ... [ 545s] Processing triggers for tex-common (6.15) ... [ 545s] Running mktexlsr. This may take some time... done. [ 545s] Processing triggers for sgml-base (1.30) ... [ 545s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 545s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 545s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 545s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 545s] Processing triggers for man-db (2.9.3-2) ... [ 546s] Errors were encountered while processing: [ 546s] libopenmpi-dev:amd64 [ 546s] exit ... [ 546s] ### VM INTERACTION START ### [ 547s] Powering off. [ 547s] [ 530.198796] reboot: Power down [ 547s] ### VM INTERACTION END ### [ 547s] [ 547s] lamb04 failed "build osmo-trx_1.2.0.81.1f37.dsc" at Thu Sep 10 16:10:25 UTC 2020. [ 547s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Sep 10 16:16:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 16:16:39 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop explicit config of mp_mncc_version References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20062 ) Change subject: ttcn3-sip: Drop explicit config of mp_mncc_version ...................................................................... ttcn3-sip: Drop explicit config of mp_mncc_version Let implementation take the default value. Change-Id: I5dbacdd4bd8110b7f6cf6bdb561af420b65c035f --- M ttcn3-sip-test/SIP_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/20062/1 diff --git a/ttcn3-sip-test/SIP_Tests.cfg b/ttcn3-sip-test/SIP_Tests.cfg index 1ced5c3..2904e76 100644 --- a/ttcn3-sip-test/SIP_Tests.cfg +++ b/ttcn3-sip-test/SIP_Tests.cfg @@ -13,7 +13,6 @@ SIP_Tests.mp_local_host := "172.18.11.103" SIP_Tests.mp_osmosip_host := "172.18.11.10" SIP_Tests.mp_mncc := "/data/unix/mncc" -MNCC_Emulation.mp_mncc_version := 6 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5dbacdd4bd8110b7f6cf6bdb561af420b65c035f Gerrit-Change-Number: 20062 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 17:34:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 10 Sep 2020 17:34:35 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid fsm: handle special 0 == 256 byte value References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20063 ) Change subject: ccid fsm: handle special 0 == 256 byte value ...................................................................... ccid fsm: handle special 0 == 256 byte value Outgoing (=from the card) transfers have a special 0 == 256 byte meaning. Change-Id: Ifb960b3e0f221962e977083f7ddea14dd0c8f29b --- M ccid_common/iso7816_fsm.c 1 file changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/63/20063/1 diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 3e78fc8..6e39142 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1246,6 +1246,8 @@ struct osmo_fsm_inst *parent_fi = fi->proc.parent; struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); uint8_t byte; + /* 7816-3 10.3.2 special case outgoing transfer 0 means 256 */ + int special_rx_val = tpduh->p3 == 0 ? 256 : tpduh->p3; switch (event) { case ISO7816_E_RX_SINGLE: @@ -1276,11 +1278,11 @@ card_uart_tx(ip->uart, msgb_l2(tfp->tpdu), msgb_l2len(tfp->tpdu), true); osmo_fsm_inst_state_chg(fi, TPDU_S_TX_REMAINING, 0, 0); } else { - card_uart_set_rx_threshold(ip->uart, tpduh->p3); - card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, tpduh->p3); + card_uart_set_rx_threshold(ip->uart, special_rx_val); + card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, special_rx_val); /* if the expected length is only one byte, cuart will issue * TPDU_S_RX_SINGLE instead of TPDU_S_RX_REMAINING (OS#4741) */ - if (tpduh->p3 == 1) + if (special_rx_val == 1) osmo_fsm_inst_state_chg(fi, TPDU_S_RX_SINGLE, 0, 0); else osmo_fsm_inst_state_chg(fi, TPDU_S_RX_REMAINING, 0, 0); @@ -1357,14 +1359,17 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); int rc; + /* 7816-3 10.3.2 special case outgoing transfer 0 means 256 */ + int special_rx_val = tpduh->p3 == 0 ? 256 : tpduh->p3; + switch (event) { case ISO7816_E_RX_COMPL: /* retrieve pending byte(s) */ - rc = card_uart_rx(ip->uart, msgb_l2(tfp->tpdu), tpduh->p3); + rc = card_uart_rx(ip->uart, msgb_l2(tfp->tpdu), special_rx_val); OSMO_ASSERT(rc > 0); msgb_put(tfp->tpdu, rc); - if (msgb_l2len(tfp->tpdu) != tpduh->p3) { - LOGPFSML(fi, LOGL_ERROR, "expected %u bytes; read %d\n", tpduh->p3, + if (msgb_l2len(tfp->tpdu) != special_rx_val) { + LOGPFSML(fi, LOGL_ERROR, "expected %u bytes; read %d\n", special_rx_val, msgb_l2len(tfp->tpdu)); } card_uart_set_rx_threshold(ip->uart, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ifb960b3e0f221962e977083f7ddea14dd0c8f29b Gerrit-Change-Number: 20063 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:15:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 10 Sep 2020 18:15:05 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Ch... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20064 ) Change subject: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Channel Release ...................................................................... gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Channel Release Correct the encoding of LTE neighbors meansurement bandwidth in Cell selection indicator after release of all TCH and SDCCH value part which is sent in the Channel Release. Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/20064/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 848f623..c2f4304 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -270,8 +270,14 @@ } else { bitvec_set_bit(&bv, 1); bitvec_set_uint(&bv, e->arfcn[i], 16); - /* No "Measurement Bandwidth" */ - bitvec_set_bit(&bv, 0); + + /* Measurement Bandwidth: 9.1.54 */ + if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i]) + bitvec_set_bit(&bv, 0); + else { + bitvec_set_bit(&bv, 1); + bitvec_set_uint(&bv, e->meas_bw[i], 3); + } /* No "Not Allowed Cells" */ bitvec_set_bit(&bv, 0); /* No "TARGET_PCID" */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:16:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 18:16:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: sip: Set & validate IP addresses and ports References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20065 ) Change subject: WIP: sip: Set & validate IP addresses and ports ...................................................................... WIP: sip: Set & validate IP addresses and ports Change-Id: Ie382f31b8b414daf598220c2e1b325b821129a40 --- M sip/SIP_Tests.ttcn 1 file changed, 98 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/20065/1 diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 9de2723..534801e 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -12,6 +12,8 @@ import from General_Types all; import from Osmocom_Types all; +import from Native_Functions all; +import from Misc_Helpers all; import from Osmocom_CTRL_Functions all; import from Osmocom_CTRL_Types all; @@ -59,8 +61,12 @@ charstring called, uint32_t mncc_call_id optional, + CallParsComputed comp optional, - CallParsComputed comp optional + charstring sip_rtp_addr, + uint16_t sip_rtp_port, + charstring cn_rtp_addr, + uint16_t cn_rtp_port } type record CallParsComputed { @@ -75,8 +81,13 @@ is_mo := is_mo, calling := "12345", called := "98766", + mncc_call_id := omit, - comp := omit + comp := omit, + sip_rtp_addr := "1.2.3.4", + sip_rtp_port := 1234, + cn_rtp_addr := "5.6.7.8", + cn_rtp_port := 5678 } private function f_CallPars_compute(inout CallPars cp) { @@ -93,6 +104,22 @@ cp.comp.sip_body := ""; } +private function f_mgcp_addr2addrtype(charstring addr) return charstring { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return "IP6"; + } + } + return "IP4"; +} + +private function f_addrstr2addr(charstring addr) return octetstring { + if (f_addr_is_ipv6(addr)) { + return f_inet6_addr(addr); + } else { + return f_inet_addr(addr); + } +} function f_init_mncc(charstring id) runs on test_CT { id := id & "-MNCC"; @@ -166,6 +193,7 @@ var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); var PDU_SIP_Request sip_req; + var PDU_SIP_Response sip_resp; var MNCC_PDU mncc; /* Ask MNCC_Emulation to "expect" a call to the given called number */ @@ -186,7 +214,11 @@ MNCC.send(ts_MNCC_CALL_CONF_ind(cp.mncc_call_id)); /* MSC <- OSC: OSC asks MSC to create RTP socket */ MNCC.receive(tr_MNCC_RTP_CREATE(cp.mncc_call_id)); - MNCC.send(ts_MNCC_RTP_CREATE(cp.mncc_call_id)); + mncc := valueof(ts_MNCC_RTP_CREATE(cp.mncc_call_id)); + mncc.u.rtp.is_ipv6 := f_addr_is_ipv6(cp.cn_rtp_addr); + mncc.u.rtp.ip := f_addrstr2addr(cp.cn_rtp_addr); + mncc.u.rtp.rtp_port := cp.cn_rtp_port; + MNCC.send(mncc); /* MSC -> OSC: After MS is ringing and sent CC ALERTING */ MNCC.send(ts_MNCC_ALERT_ind(cp.mncc_call_id)); @@ -200,10 +232,15 @@ SIP.clear; interleave { /* MSC <- OSC: OSC asks MSC to connect its RTP stream to remote end */ - [] MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id)) {} + [] MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id, f_addrstr2addr(cp.sip_rtp_addr), cp.sip_rtp_port)) {} /* OSC -> SIP: OSC confirms call establishment to SIP side */ [] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, ?, - "INVITE", 200, ?, "OK", ?)) {} + "INVITE", 200, ?, "OK", ?)) -> value sip_resp { + if (not match(sip_resp.messageBody, pattern "*" & cp.cn_rtp_addr & "*")) { + setverdict(fail, "wrong ip addr sent in SIP SDP, not containing ", cp.cn_rtp_addr); + mtc.stop; + } + } } /* OSC <- SIP: SIP world acknowledges "200 OK" */ SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, @@ -229,7 +266,10 @@ MNCC.receive(tr_MNCC_RTP_CREATE(cp.mncc_call_id)) { var MNCC_PDU mncc := valueof(ts_MNCC_RTP_CREATE(cp.mncc_call_id)); mncc.u.rtp.payload_msg_type := oct2int('0300'O); - MNCC.send(mncc); /* FIXME: port/ip */ + mncc.u.rtp.is_ipv6 := f_addr_is_ipv6(cp.cn_rtp_addr); + mncc.u.rtp.ip := f_addrstr2addr(cp.cn_rtp_addr); + mncc.u.rtp.rtp_port := cp.cn_rtp_port; + MNCC.send(mncc); } /* OSC -> SIP: Send INVITE with GSM side IP/Port in SDP */ SIP.receive(tr_SIP_INVITE(?, sip_addr_gsm, sip_addr_ext, ?, ?)) -> value sip_req { @@ -304,9 +344,12 @@ /* Successful MT Call, which is subsequently released by GSM side */ private function f_TC_mt_success_rel_gsm(charstring id) runs on ConnHdlr { - var CallPars cp := valueof(t_CallPars(false)); + var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); - cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 0.0.0.0\r\ns=GSM Call\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 0 RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; + cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & + f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & + " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) f_establish_mt(cp); @@ -320,6 +363,18 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(false)); + vc_conn := f_start_handler(refers(f_TC_mt_success_rel_gsm), pars); + vc_conn.done; +} +testcase TC_mt_success_rel_gsm_ipv6() runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(); + pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(false)); + pars.g_cp.sip_rtp_addr := "::1"; + pars.g_cp.cn_rtp_addr := "::2"; vc_conn := f_start_handler(refers(f_TC_mt_success_rel_gsm), pars); vc_conn.done; } @@ -328,7 +383,10 @@ private function f_TC_mt_success_rel_sip(charstring id) runs on ConnHdlr { var CallPars cp := valueof(t_CallPars(false)); f_CallPars_compute(cp); - cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 0.0.0.0\r\ns=GSM Call\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 0 RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; + cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & + f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & + " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) f_establish_mt(cp); @@ -349,9 +407,12 @@ /* Successful MO Call, which is subsequently released by GSM side */ private function f_TC_mo_success_rel_gsm(charstring id) runs on ConnHdlr { - var CallPars cp := valueof(t_CallPars(true)); + var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); - cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 0.0.0.0\r\ns=GSM Call\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 0 RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; + cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & + f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & + " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) f_establish_mo(cp); @@ -365,6 +426,18 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(true)); + vc_conn := f_start_handler(refers(f_TC_mo_success_rel_gsm), pars); + vc_conn.done; +} +testcase TC_mo_success_rel_gsm_ipv6() runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(); + pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(true)); + pars.g_cp.sip_rtp_addr := "::1"; + pars.g_cp.cn_rtp_addr := "::2"; vc_conn := f_start_handler(refers(f_TC_mo_success_rel_gsm), pars); vc_conn.done; } @@ -373,7 +446,10 @@ private function f_TC_mo_success_rel_sip(charstring id) runs on ConnHdlr { var CallPars cp := valueof(t_CallPars(true)); f_CallPars_compute(cp); - cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 0.0.0.0\r\ns=GSM Call\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 0 RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; + cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & + f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & + " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) f_establish_mo(cp); @@ -395,7 +471,10 @@ private function f_TC_mo_setup_disc_late_rtp(charstring id) runs on ConnHdlr { var CallPars cp := valueof(t_CallPars(true)); f_CallPars_compute(cp); - cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 0.0.0.0\r\ns=GSM Call\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 0 RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; + cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & + f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & + " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0); var MNCC_number dst := valueof(ts_MNCC_number(cp.called, GSM48_TON_UNKNOWN)); @@ -415,7 +494,10 @@ MNCC.receive(tr_MNCC_RTP_CREATE(cp.mncc_call_id)) { var MNCC_PDU mncc := valueof(ts_MNCC_RTP_CREATE(cp.mncc_call_id)); mncc.u.rtp.payload_msg_type := oct2int('0300'O); - MNCC.send(mncc); /* FIXME: port/ip */ + mncc.u.rtp.is_ipv6 := f_addr_is_ipv6(cp.cn_rtp_addr); + mncc.u.rtp.ip := f_addrstr2addr(cp.cn_rtp_addr); + mncc.u.rtp.rtp_port := cp.cn_rtp_port; + MNCC.send(mncc); } /* OSC -> SIP: We should never receive INVITE */ @@ -441,8 +523,10 @@ control { execute( TC_mt_success_rel_gsm() ); + execute( TC_mt_success_rel_gsm_ipv6() ); execute( TC_mt_success_rel_sip() ); execute( TC_mo_success_rel_gsm() ); + execute( TC_mo_success_rel_gsm_ipv6() ); execute( TC_mo_success_rel_sip() ); execute( TC_mo_setup_disc_late_rtp() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie382f31b8b414daf598220c2e1b325b821129a40 Gerrit-Change-Number: 20065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:20:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 18:20:00 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Ch... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20064 ) Change subject: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Channel Release ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20064/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/20064/1//COMMIT_MSG at 9 PS1, Line 9: Correct the encoding of LTE neighbors meansurement bandwidth in typo: measurement All this description talks about correcting, fixing, etc. but it looks like simply we don't support submitting those bits until now? is that actually a bug or some network preference? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 10 Sep 2020 18:20:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:21:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 18:21:30 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Ch... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20064 ) Change subject: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Channel Release ...................................................................... Patch Set 1: Missing Related: SYS##4871 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 10 Sep 2020 18:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:21:57 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 10 Sep 2020 18:21:57 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Ch... In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 to look at the new patch set (#2). Change subject: gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Channel Release ...................................................................... gsm 04.08: fix encoding of LTE neighbors measurement bandwindth in Channel Release Correct the encoding of LTE neighbors measurement bandwidth in Cell selection indicator after release of all TCH and SDCCH value part which is sent in the Channel Release. Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/20064/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:26:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 10 Sep 2020 18:26:18 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel... In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 to look at the new patch set (#3). Change subject: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release ...................................................................... gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release Encoding missing measurement bandwidth of LTE neighbors in Channel Release (Cell selection indicator after release of all TCH and SDCCH value part). The measurement bandwidth was encoded in the neighbors description transmitted in SI2quater while missing in the Channel Release which would overwrite the SI2quater measurement bandwidth. Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/20064/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:45:03 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 10 Sep 2020 18:45:03 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: flush channel request queue on RSL bootstrap References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20066 ) Change subject: abis_rsl.c: flush channel request queue on RSL bootstrap ...................................................................... abis_rsl.c: flush channel request queue on RSL bootstrap When RSL link is bootstrapped the BSC should clear the channel request queue. Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Related: OS#4549 --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/osmo_bsc_main.c 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/20066/1 diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 9879497..964e282 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -119,6 +119,7 @@ int rsl_tx_rf_chan_release(struct gsm_lchan *lchan); void abis_rsl_chan_rqd_queue_poll(struct gsm_bts *bts); +void abis_rsl_chan_rqd_queue_flush(struct gsm_bts *bts); #endif /* RSL_MT_H */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 74cc760..1d75c94 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1398,6 +1398,17 @@ } } +/* Flush all channel requests pending on this BTS */ +void abis_rsl_chan_rqd_queue_flush(struct gsm_bts *bts) +{ + struct chan_rqd *rqd; + struct chan_rqd *rqd_tmp; + + llist_for_each_entry_safe(rqd, rqd_tmp, &bts->chan_rqd_queue, entry) { + llist_del(&rqd->entry); + } +} + /* MS has requested a channel on the RACH */ static int rsl_rx_chan_rqd(struct msgb *msg) { diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 560f8fd..6d835ba 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -329,6 +329,9 @@ /* Start CBCH transmit timer if CBCH is present */ if (trx->nr == 0 && gsm_bts_get_cbch(trx->bts)) bts_cbch_timer_schedule(trx->bts); + + /* Drop all expired channel requests in the list */ + abis_rsl_chan_rqd_queue_flush(trx->bts); } static void all_ts_dispatch_event(struct gsm_bts_trx *trx, uint32_t event) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Gerrit-Change-Number: 20066 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 18:45:04 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 10 Sep 2020 18:45:04 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: inform user when expired channel requests get tossed References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20067 ) Change subject: abis_rsl: inform user when expired channel requests get tossed ...................................................................... abis_rsl: inform user when expired channel requests get tossed At the moment expired channel requests are dropped silently, however, it might help to know when this happens - not only for debugging. Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Related: OS#4549 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/20067/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 1d75c94..5d72ad5 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1384,9 +1384,12 @@ llist_for_each_entry_safe(rqd, rqd_tmp, &bts->chan_rqd_queue, entry) { /* If the channel request is older than the radio link timeout we drop it. This also means that the * queue is under its overflow limit again. */ - if (timestamp_current - rqd->timestamp > rlt) + if (timestamp_current - rqd->timestamp > rlt) { + LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: tossing expired channel request" + "(ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", + rqd->ref.ra, bts->network->neci, rqd->reason); llist_del(&rqd->entry); - else + } else rqd_count++; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Gerrit-Change-Number: 20067 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 19:04:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 19:04:48 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20064 ) Change subject: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 19:04:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 19:05:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 19:05:48 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: flush channel request queue on RSL bootstrap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20066 ) Change subject: abis_rsl.c: flush channel request queue on RSL bootstrap ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20066/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20066/1/src/osmo-bsc/abis_rsl.c at 1408 PS1, Line 1408: llist_del(&rqd->entry); just wondering... doesn't those pointers need to be freed somehow? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Gerrit-Change-Number: 20066 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 19:05:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 19:06:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 10 Sep 2020 19:06:49 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: inform user when expired channel requests get tossed In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20067 ) Change subject: abis_rsl: inform user when expired channel requests get tossed ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20067/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20067/1/src/osmo-bsc/abis_rsl.c at 1392 PS1, Line 1392: } else add {} after the else too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Gerrit-Change-Number: 20067 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 19:06:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 20:41:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 10 Sep 2020 20:41:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix whitespace typo References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20068 ) Change subject: BSC_Tests: fix whitespace typo ...................................................................... BSC_Tests: fix whitespace typo Change-Id: I68d7b6ef1d35b798f66a04bce4de29fdd75ff7f1 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/20068/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4c45028..2eb9b24 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7400,7 +7400,7 @@ execute( TC_si2quater_48_earfcns() ); execute( TC_si2quater_49_earfcns() ); execute( TC_si_acc_rotate() ); - execute (TC_si_acc_ramp_rotate() ); + execute( TC_si_acc_ramp_rotate() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68d7b6ef1d35b798f66a04bce4de29fdd75ff7f1 Gerrit-Change-Number: 20068 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 20:41:03 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 10 Sep 2020 20:41:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: check for the same measurement bandwidth as in SI2quater o... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 ) Change subject: BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release ...................................................................... BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release osmo-bsc is using the same LTE neighbors of the SI2quater in the Channel Release - Cell selection indicator after release of all TCH and SDCCH IE. Ensure the same measurement bandwidth is present to not overwrite the measurements bandwidth from the SI2quater. Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/20069/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 2eb9b24..51298c8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2222,7 +2222,7 @@ for (var integer i := 0; i < count; i := i + 1) { var integer earfcn := f_test_si2quater_earfcn_by_idx(i); - cells[i] := tr_CellSelIndValue_EUTRAN_Descr(earfcn, meas_bw_presence := '0'B, meas_bw := omit); + cells[i] := tr_CellSelIndValue_EUTRAN_Descr(earfcn, '1'B, 3); } return tr_CellSelIndValue_EUTRAN(cells); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 Gerrit-Change-Number: 20069 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 21:12:45 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 10 Sep 2020 21:12:45 +0000 Subject: Change in pysim[master]: sysmo-isim-sja2: use new ADM pin References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20070 ) Change subject: sysmo-isim-sja2: use new ADM pin ...................................................................... sysmo-isim-sja2: use new ADM pin The card in the automatic test setup had been replaced, change the ADM pin so that it matches the new card. Change-Id: I413f4b8267e01727c59ad135881b3a2ed723ff5f --- M pysim-testdata/sysmoISIM-SJA2.data 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/20070/1 diff --git a/pysim-testdata/sysmoISIM-SJA2.data b/pysim-testdata/sysmoISIM-SJA2.data index 4b45a06..bc99766 100644 --- a/pysim-testdata/sysmoISIM-SJA2.data +++ b/pysim-testdata/sysmoISIM-SJA2.data @@ -4,4 +4,4 @@ KI=AABBCCDDEEFFAABBCCDDEEFFAABBCCDD OPC=12345678901234567890123456789012 IMSI=001010000000102 -ADM=72273953 +ADM=11111111 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I413f4b8267e01727c59ad135881b3a2ed723ff5f Gerrit-Change-Number: 20070 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 21:37:07 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 10 Sep 2020 21:37:07 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 24: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/include/osmocom/gprs/gprs_ns2.h at 85 PS24, Line 85: /* TODO: implement resource distribution */ > If you declare a variable of type "struct osmo_gprs_ns2_prim" in a program an then change the size o [?] The link selector is actually part of the TODO -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 24 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 10 Sep 2020 21:37:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 23:02:27 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 10 Sep 2020 23:02:27 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid fsm: proper wtime calculation References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20071 ) Change subject: ccid fsm: proper wtime calculation ...................................................................... ccid fsm: proper wtime calculation The timeouts had a minor off by a million problem because WT (in ETU) = WI * 960 as per 7816-3 10.2, but WI was used as WT without the factor of 960 after the pps exchange, so WT (in ETU) was accidentally set to 10 instead of 9600 for the default WI=10. Additionally that time was only added once, even though the wait time is the time between the leading character edge of one character and the next one, irrespective of direction, so the total wait time is this multiplied with the number of expected bytes. In practice this had no real effect due to to a reasonable minimum timeout value and cards that were much faster than this. Change-Id: I9ea0b6b51c8cc6f08a36b48e516c64b5e2bbaf9b --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/71/20071/1 diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index ba29acd..23577eb 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -256,7 +256,7 @@ */ card_uart_ctrl(ss->cuart, CUART_CTL_SET_CLOCK_FREQ, fmax); card_uart_ctrl(ss->cuart, CUART_CTL_SET_FD, F/D); - card_uart_ctrl(ss->cuart, CUART_CTL_WTIME, cs->proposed_pars.t0.waiting_integer); + card_uart_ctrl(ss->cuart, CUART_CTL_WTIME, cs->proposed_pars.t0.waiting_integer * 960); cs->pars = cs->proposed_pars; resp = ccid_gen_parameters_t0(cs, ss->seq, CCID_CMD_STATUS_OK, 0); diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index bc99631..c617754 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -74,9 +74,8 @@ int etu_in_us = get_etu_in_us(cuart) + 1; cuart->wtime_etu = cuart->wtime_etu ? cuart->wtime_etu : 1; - /* timemout is wtime * ETU + expected number of bytes * (12ETU+1 slack)ETU */ - usecs = etu_in_us * cuart->wtime_etu + - etu_in_us * cuart->current_wtime_byte * (12+1); + /* timemout is wtime * ETU * expected number of bytes */ + usecs = etu_in_us * cuart->wtime_etu * cuart->current_wtime_byte; /* limit lower wait time to reasonable value */ usecs = usecs < 300000 ? 300000 : usecs; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I9ea0b6b51c8cc6f08a36b48e516c64b5e2bbaf9b Gerrit-Change-Number: 20071 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 10 23:03:14 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 10 Sep 2020 23:03:14 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid fsm: proper wtime calculation In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20071 ) Change subject: ccid fsm: proper wtime calculation ...................................................................... ccid fsm: proper wtime calculation The timeouts had a minor off by a million problem because WT (in ETU) = WI * 960 as per 7816-3 10.2, but WI was used as WT without the factor of 960 after the pps exchange, so WT (in ETU) was accidentally set to 10 instead of 9600 for the default WI=10. Additionally that time was only added once, even though the wait time is the time between the leading character edge of one character and the next one, irrespective of direction, so the total wait time is this multiplied with the number of expected bytes. In practice this had no real effect due to to a reasonable minimum timeout value and cards that were much faster than this. Closes: OS#4742 Change-Id: I9ea0b6b51c8cc6f08a36b48e516c64b5e2bbaf9b --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/71/20071/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I9ea0b6b51c8cc6f08a36b48e516c64b5e2bbaf9b Gerrit-Change-Number: 20071 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 11 00:09:19 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 00:09:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5ac03d3431f_74802add79ac65f8438264@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 405s] [612/642] installing dbus-user-session-1.12.20-1 [ 405s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 405s] Processing triggers for libc-bin (2.31-3) ... [ 405s] [614/642] installing texlive-xetex-2020.20200804-2 [ 407s] Processing triggers for tex-common (6.15) ... [ 407s] Running mktexlsr. This may take some time... done. [ 407s] Building format(s) --all. [ 441s] This may take some time... done. [ 441s] Processing triggers for man-db (2.9.3-2) ... [ 441s] [615/642] installing dblatex-0.3.11py3-1 [ 442s] Processing triggers for man-db (2.9.3-2) ... [ 442s] Processing triggers for tex-common (6.15) ... [ 442s] Running mktexlsr. This may take some time... done. [ 443s] Processing triggers for sgml-base (1.30) ... [ 443s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 443s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 443s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 443s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 443s] Processing triggers for man-db (2.9.3-2) ... [ 444s] Errors were encountered while processing: [ 444s] libopenmpi-dev:amd64 [ 444s] exit ... [ 444s] ### VM INTERACTION START ### [ 445s] Powering off. [ 445s] [ 426.998972] reboot: Power down [ 445s] ### VM INTERACTION END ### [ 445s] [ 445s] old-atreju4 failed "build osmo-trx_1.2.0.dsc" at Fri Sep 11 00:09:09 UTC 2020. [ 445s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 00:09:02 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 00:09:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5ac03a9f053_74802add79ac65f84379ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 424s] [612/642] installing dbus-user-session-1.12.20-1 [ 424s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 425s] Processing triggers for libc-bin (2.31-3) ... [ 425s] [614/642] installing texlive-xetex-2020.20200804-2 [ 426s] Processing triggers for tex-common (6.15) ... [ 426s] Running mktexlsr. This may take some time... done. [ 426s] Building format(s) --all. [ 457s] This may take some time... done. [ 457s] Processing triggers for man-db (2.9.3-2) ... [ 458s] [615/642] installing dblatex-0.3.11py3-1 [ 458s] Processing triggers for man-db (2.9.3-2) ... [ 459s] Processing triggers for tex-common (6.15) ... [ 459s] Running mktexlsr. This may take some time... done. [ 460s] Processing triggers for sgml-base (1.30) ... [ 460s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 460s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 460s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 460s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 460s] Processing triggers for man-db (2.9.3-2) ... [ 461s] Errors were encountered while processing: [ 461s] libopenmpi-dev:amd64 [ 461s] exit ... [ 461s] ### VM INTERACTION START ### [ 462s] Powering off. [ 462s] [ 445.645719] reboot: Power down [ 463s] ### VM INTERACTION END ### [ 463s] [ 463s] lamb12 failed "build osmo-trx_1.2.0.81.1f37.dsc" at Fri Sep 11 00:08:52 UTC 2020. [ 463s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 01:37:19 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 01:37:19 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f5ad4d9d0401_74802add79ac65f84675f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 127s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 127s] [COMPILING libboard/qmod/source/card_pres.c] [ 128s] [COMPILING libboard/qmod/source/wwan_led.c] [ 128s] [COMPILING libboard/qmod/source/i2c.c] [ 128s] [COMPILING libboard/qmod/source/board_qmod.c] [ 128s] [COMPILING apps/dfu/main.c] [ 128s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 128s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 128s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 128s] Memory region Used Size Region Size %age Used [ 128s] rom: 16588 B 16 KB 101.25% [ 128s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 128s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 128s] collect2: error: ld returned 1 exit status [ 128s] % [ 128s] make[2]: *** [Makefile:234: flash] Error 1 [ 128s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 128s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 128s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 128s] dh_auto_build: error: make -j1 returned exit code 2 [ 128s] make: *** [debian/rules:16: build] Error 25 [ 128s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 128s] ### VM INTERACTION START ### [ 132s] [ 124.619131] sysrq: Power Off [ 132s] [ 124.626254] reboot: Power down [ 132s] ### VM INTERACTION END ### [ 132s] [ 132s] sheep86 failed "build simtrace2_0.7.0.63.39070.dsc" at Fri Sep 11 01:37:06 UTC 2020. [ 132s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 02:10:45 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 02:10:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5adcb5956c3_74802add79ac65f847243a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 686s] [612/642] installing dbus-user-session-1.12.20-1 [ 686s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 686s] Processing triggers for libc-bin (2.31-3) ... [ 686s] [614/642] installing texlive-xetex-2020.20200804-2 [ 689s] Processing triggers for tex-common (6.15) ... [ 689s] Running mktexlsr. This may take some time... done. [ 689s] Building format(s) --all. [ 725s] This may take some time... done. [ 725s] Processing triggers for man-db (2.9.3-2) ... [ 726s] [615/642] installing dblatex-0.3.11py3-1 [ 727s] Processing triggers for man-db (2.9.3-2) ... [ 727s] Processing triggers for tex-common (6.15) ... [ 728s] Running mktexlsr. This may take some time... done. [ 728s] Processing triggers for sgml-base (1.30) ... [ 728s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 729s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 729s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 729s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 729s] Processing triggers for man-db (2.9.3-2) ... [ 731s] Errors were encountered while processing: [ 731s] libopenmpi-dev:amd64 [ 731s] exit ... [ 731s] ### VM INTERACTION START ### [ 732s] Powering off. [ 732s] [ 699.107391] reboot: Power down [ 732s] ### VM INTERACTION END ### [ 732s] [ 732s] lamb21 failed "build osmo-trx_1.2.0.81.1f37.dsc" at Fri Sep 11 02:10:40 UTC 2020. [ 732s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 03:48:28 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 03:48:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5af38ef017c_74802add79ac65f8486270@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 327s] [612/642] installing dbus-user-session-1.12.20-1 [ 327s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 327s] Processing triggers for libc-bin (2.31-3) ... [ 327s] [614/642] installing texlive-xetex-2020.20200804-2 [ 328s] Processing triggers for tex-common (6.15) ... [ 329s] Running mktexlsr. This may take some time... done. [ 329s] Building format(s) --all. [ 360s] This may take some time... done. [ 360s] Processing triggers for man-db (2.9.3-2) ... [ 360s] [615/642] installing dblatex-0.3.11py3-1 [ 361s] Processing triggers for man-db (2.9.3-2) ... [ 361s] Processing triggers for tex-common (6.15) ... [ 362s] Running mktexlsr. This may take some time... done. [ 362s] Processing triggers for sgml-base (1.30) ... [ 362s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 362s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 362s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 362s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 362s] Processing triggers for man-db (2.9.3-2) ... [ 363s] Errors were encountered while processing: [ 363s] libopenmpi-dev:amd64 [ 363s] exit ... [ 363s] ### VM INTERACTION START ### [ 364s] Powering off. [ 364s] [ 348.727240] reboot: Power down [ 364s] ### VM INTERACTION END ### [ 364s] [ 364s] old-atreju3 failed "build osmo-trx_1.2.0.81.1f37.dsc" at Fri Sep 11 03:48:16 UTC 2020. [ 364s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 03:49:36 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 03:49:36 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5af3e7c4eab_74802add79ac65f8486494@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 264s] [612/642] installing dbus-user-session-1.12.20-1 [ 264s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 264s] Processing triggers for libc-bin (2.31-3) ... [ 264s] [614/642] installing texlive-xetex-2020.20200804-2 [ 265s] Processing triggers for tex-common (6.15) ... [ 265s] Running mktexlsr. This may take some time... done. [ 266s] Building format(s) --all. [ 290s] This may take some time... done. [ 290s] Processing triggers for man-db (2.9.3-2) ... [ 290s] [615/642] installing dblatex-0.3.11py3-1 [ 291s] Processing triggers for man-db (2.9.3-2) ... [ 291s] Processing triggers for tex-common (6.15) ... [ 291s] Running mktexlsr. This may take some time... done. [ 291s] Processing triggers for sgml-base (1.30) ... [ 291s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 292s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 292s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 292s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 292s] Processing triggers for man-db (2.9.3-2) ... [ 292s] Errors were encountered while processing: [ 292s] libopenmpi-dev:amd64 [ 292s] exit ... [ 292s] ### VM INTERACTION START ### [ 293s] Powering off. [ 293s] [ 282.849494] reboot: Power down [ 293s] ### VM INTERACTION END ### [ 293s] [ 293s] build79 failed "build osmo-trx_1.2.0.dsc" at Fri Sep 11 03:49:32 UTC 2020. [ 293s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:35:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 10:35:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: support IPv6 NSVC addr In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 ) Change subject: library/PCUIF_Types: version 10: support IPv6 NSVC addr ...................................................................... library/PCUIF_Types: version 10: support IPv6 NSVC addr Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Tweaked-By: Vadim Yanitskiy Related: SYS#4915 --- M library/NS_Emulation.ttcn M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn M pcu/SGSN_Components.ttcn M sgsn/gen_links.sh 5 files changed, 59 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 697a482..6f9bc39 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -16,6 +16,7 @@ import from NS_CodecPort all; import from NS_CodecPort_CtrlFunct all; import from IPL4asp_Types all; + import from PCUIF_Types all; type record NsUnitdataRequest { BssgpBvci bvci, @@ -124,6 +125,7 @@ } type record NSConfiguration { + PCUIF_AddrType remote_proto, PortNumber local_udp_port, charstring local_ip, PortNumber remote_udp_port, diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index f0200af..b400267 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -13,6 +13,7 @@ import from General_Types all; import from Osmocom_Types all; +import from Native_Functions all; modulepar { /* PCUIF version supported by the IUT */ @@ -212,13 +213,34 @@ record length(2) of uint16_t nsvci, record length(2) of uint16_t local_port, record length(2) of uint16_t remote_port, - record length(2) of OCT4 remote_ip + PCUIF_RemoteAddr remote_addr } with { /* NOTE: TITAN is not smart enough to handle 'version < 10' and 'version > 9', * so we cannot support more than two versions at the same time here. Sigh. */ variant (trx) "CROSSTAG(v09, version = 9; v10, version = 10)" + variant (remote_addr) "CROSSTAG(v09, version = 9; v10, version = 10)" }; +type union PCUIF_RemoteAddr { + PCUIF_RemoteAddrV09 v09, + PCUIF_RemoteAddrV10 v10 +} with { variant "" }; + +type record PCUIF_RemoteAddrV09 { + record length(2) of OCT4 addr +} with { variant "" }; + +type enumerated PCUIF_AddrType { + PCUIF_ADDR_TYPE_UNSPEC ('00'O), + PCUIF_ADDR_TYPE_IPV4 ('04'O), + PCUIF_ADDR_TYPE_IPV6 ('29'O) +} with { variant "FIELDLENGTH(8)" }; + +type record PCUIF_RemoteAddrV10 { + record length(2) of PCUIF_AddrType addr_type, + record length(2) of octetstring addr length(16) +} with { variant "" }; + type record PCUIF_act_req { uint8_t is_activate, uint8_t trx_nr, @@ -839,7 +861,7 @@ nsvci := ?, local_port := ?, remote_port := ?, - remote_ip := ? + remote_addr := ? } } } @@ -947,5 +969,34 @@ } } +/* TODO: second (redundant) NSVC connection is not (yet) supported */ +function f_PCUIF_ver_INFO_RemoteAddr(PCUIF_AddrType addr_type, + charstring addr) +return PCUIF_RemoteAddr { + var PCUIF_RemoteAddr remote_addr; + + if (PCUIF_Types.mp_pcuif_version >= 10) { + remote_addr.v10.addr_type[0] := addr_type; + if (addr_type == PCUIF_ADDR_TYPE_IPV4) { + remote_addr.v10.addr[0] := f_inet_addr(addr); + } else { + remote_addr.v10.addr[0] := f_inet6_addr(addr); + } + remote_addr.v10.addr_type[1] := PCUIF_ADDR_TYPE_UNSPEC; + remote_addr.v10.addr[1] := f_pad_oct(''O, 16, '00'O); + } else { + if (addr_type != PCUIF_ADDR_TYPE_IPV4) { + testcase.stop("NSVC address type := ", addr_type, + "is not supported in version := ", + PCUIF_Types.mp_pcuif_version); + } + /* v9 requires the IP in host byte order */ + remote_addr.v09.addr[0] := f_inet_haddr(addr); + remote_addr.v09.addr[0] := f_pad_oct(''O, 4, '00'O); + } + + return remote_addr; +} + } with { encode "RAW" variant "BYTEORDER(first)" }; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index df2964c..f5176d4 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -92,7 +92,8 @@ nsvci := { mp_nsconfig.nsvci, 0 }, local_port := { mp_nsconfig.remote_udp_port, 0 }, remote_port := { mp_nsconfig.local_udp_port, 0 }, - remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O } + remote_addr := f_PCUIF_ver_INFO_RemoteAddr( + mp_nsconfig.remote_proto, mp_nsconfig.local_ip) } type record lqual_range { diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn index 4bbd18c..7bf8705 100644 --- a/pcu/SGSN_Components.ttcn +++ b/pcu/SGSN_Components.ttcn @@ -35,6 +35,7 @@ }; NSConfiguration mp_nsconfig := { + remote_proto := PCUIF_ADDR_TYPE_IPV4, local_udp_port := 23000, local_ip := "127.0.0.1", remote_udp_port := 21000, diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index bd3a7ea..541670d 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -84,7 +84,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " -FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " +FILES+="NS_Emulation.ttcn PCUIF_Types.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 " FILES+="Osmocom_VTY_Functions.ttcn " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Gerrit-Change-Number: 19420 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:42:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 10:42:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: add IPv6 support for SNS In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 ) Change subject: PCU: add IPv6 support for SNS ...................................................................... Patch Set 2: > Patch Set 2: > > I somehow don't like the idea that IPv6 is a separate config file and that we have to execute the same test suite with multiple config files. This is difficult to use manually (people will forget to execute it a second time) and it also requires Junit XML rewriting as otherwise the results will be overwritten. > > I think it would be better if this was either integrated into the normale PCU_Tests module with tests containing ipv6 in the TC_... name, or maybe a PCU_Tests_IPV6.ttcn whihc then has the same list of test cases as the other one. Pluse a comment in the non-IPv6 tests that new test cases must be added twice. > > I'm not sure if there is a more elegant solution, i.e. if one control statment can 'inherit' another one - or if one wants to play with ttcnpp and #defines which then generate the control statement in both components. All not very elegant, probably. If it's a second jenkins job it would fix the Junit XML problem. But still people might forget it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I43d64caca600fff78f3fbbb3e8179f447f235d46 Gerrit-Change-Number: 20003 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 10:42:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:43:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 10:43:26 +0000 Subject: Change in osmo-trx[master]: [cosmetic] radioInterfaceMulti: More comments References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/20072 ) Change subject: [cosmetic] radioInterfaceMulti: More comments ...................................................................... [cosmetic] radioInterfaceMulti: More comments Change-Id: If608627a77c39b5faabc72c7dd72d00fae8697a9 --- M Transceiver52M/radioInterfaceMulti.cpp 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/72/20072/1 diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 29f85ca..e654184 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -38,6 +38,7 @@ /* Universal resampling parameters */ #define NUMCHUNKS 24 +/* number of narrow-band virtual ARFCNs in this wide-band multi-ARFCN device */ #define MCHANS 4 RadioInterfaceMulti::RadioInterfaceMulti(RadioDevice *radio, size_t tx_sps, @@ -79,6 +80,10 @@ RadioInterface::close(); } +/*! we re-map the physical channels from the filter bank to logical per-TRX channels + * \param[in] pchan physical channel number within the channelizer + * \param[in] chans total number of narrow-band ARFCN channels + * \returns logical (TRX) channel number, or -1 in case there is none */ static int getLogicalChan(size_t pchan, size_t chans) { switch (chans) { @@ -113,6 +118,9 @@ return -1; } +/*! do we need to frequency shift our spectrum or not? + * \param chans total number of channels + * \returns 1 if we need to shift; 0 if not; -1 on error */ static int getFreqShift(size_t chans) { switch (chans) { @@ -154,6 +162,7 @@ tx_freq_state.resize(mChans); active.resize(MCHANS, false); + /* 4 == sps */ inchunk = RESAMP_INRATE * 4; outchunk = RESAMP_OUTRATE * 4; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If608627a77c39b5faabc72c7dd72d00fae8697a9 Gerrit-Change-Number: 20072 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:43:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 10:43:26 +0000 Subject: Change in osmo-trx[master]: [cosmetic] radioIntefaceMulti: Fix whitespace / indent References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/20073 ) Change subject: [cosmetic] radioIntefaceMulti: Fix whitespace / indent ...................................................................... [cosmetic] radioIntefaceMulti: Fix whitespace / indent Change-Id: I3addb844a79a8f4e8af03323fc50e57b8a3590a8 --- M Transceiver52M/radioInterfaceMulti.cpp 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/73/20073/1 diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index e654184..1ca3fbb 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -440,14 +440,13 @@ double RadioInterfaceMulti::setRxGain(double db, size_t chan) { - if (chan == 0) - return mDevice->setRxGain(db); - else - return mDevice->getRxGain(); + if (chan == 0) + return mDevice->setRxGain(db); + else + return mDevice->getRxGain(); } int RadioInterfaceMulti::setPowerAttenuation(int atten, size_t chan) { - return RadioInterface::setPowerAttenuation(atten, 0); - + return RadioInterface::setPowerAttenuation(atten, 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3addb844a79a8f4e8af03323fc50e57b8a3590a8 Gerrit-Change-Number: 20073 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:45:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 10:45:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 ) Change subject: SGSN: introduce NS tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008/1/sgsn/gen_links.sh File sgsn/gen_links.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008/1/sgsn/gen_links.sh at 98 PS1, Line 98: : DIR=../pcu : FILES="RAW_NS.ttcn SGSN_Components.ttcn GPRS_Context.ttcn " : gen_links $DIR $FILES > I don't think we ever link some files that are not in library or in one of the dependency modules (E [?] The others are a dependency of RAW_NS. I'ven't checked how deep the dependency goes. I'll try to move it and try to break the dependency. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 10:45:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:45:12 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 10:45:12 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 10:45:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:51:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 10:51:56 +0000 Subject: Change in osmo-trx[master]: [cosmetic] radioIntefaceMulti: Fix whitespace / indent In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20073 ) Change subject: [cosmetic] radioIntefaceMulti: Fix whitespace / indent ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3addb844a79a8f4e8af03323fc50e57b8a3590a8 Gerrit-Change-Number: 20073 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 11 Sep 2020 10:51:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 10:54:42 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 10:54:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix whitespace typo In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20068 ) Change subject: BSC_Tests: fix whitespace typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68d7b6ef1d35b798f66a04bce4de29fdd75ff7f1 Gerrit-Change-Number: 20068 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 11 Sep 2020 10:54:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:04:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 11:04:29 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add support for osmo-e1d In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19929 to look at the new patch set (#2). Change subject: e1-prbs-test: Add support for osmo-e1d ...................................................................... e1-prbs-test: Add support for osmo-e1d This allows e1-prbs-test to not only use DAHDI devices, but also osmo-e1d supported devices Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 --- M contrib/e1-prbs-test/Makefile M contrib/e1-prbs-test/main.c 2 files changed, 68 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/29/19929/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 Gerrit-Change-Number: 19929 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:04:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 11:04:30 +0000 Subject: Change in osmo-e1d[master]: src/ctl.c: Log NOTICE messages whenever client send unexpected requests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20074 ) Change subject: src/ctl.c: Log NOTICE messages whenever client send unexpected requests ...................................................................... src/ctl.c: Log NOTICE messages whenever client send unexpected requests Change-Id: Icd47de13ab84b89ce5fb21c24713bae760611d32 --- M src/ctl.c 1 file changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/74/20074/1 diff --git a/src/ctl.c b/src/ctl.c index fee96f8..8da21fd 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -360,16 +360,22 @@ /* Process query and find timeslot */ intf = e1d_find_intf(e1d, hdr->intf); - if (!intf) + if (!intf) { + LOGP(DE1D, LOGL_NOTICE, "Client request for non-existant Interface %u\n", hdr->intf); return 0; + } line = e1_intf_find_line(intf, hdr->line); - if (!line) + if (!line) { + LOGPIF(intf, DE1D, LOGL_NOTICE, "Client request for non-existant line %u\n", hdr->line); return 0; + } ts = _e1d_get_ts(line, hdr->ts); - if (!ts) + if (!ts) { + LOGPLI(line, DE1D, LOGL_NOTICE, "Client request for non-existant ts %u\n", hdr->ts); return 0; + } /* Select mode */ switch (cfg->mode) { @@ -380,19 +386,24 @@ mode = E1_TS_MODE_HDLCFCS; break; default: + LOGPTS(ts, DE1D, LOGL_NOTICE, "Client request for unknown mode %u\n", cfg->mode); return 0; } - if (cfg->read_bufsize == 0) + if (cfg->read_bufsize == 0) { + LOGPTS(ts, DE1D, LOGL_NOTICE, "Client request for invalid bufsize %u\n", cfg->read_bufsize); return 0; + } /* If already open, close previous */ e1_ts_stop(ts); /* Init */ ret = _e1d_ts_start(ts, mode, cfg->read_bufsize); - if (ret < 0) + if (ret < 0) { + LOGPTS(ts, DE1D, LOGL_ERROR, "Unable to start timeslot: %d\n", ret); return ret; + } *rfd = ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icd47de13ab84b89ce5fb21c24713bae760611d32 Gerrit-Change-Number: 20074 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:18:09 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 11:18:09 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20064 ) Change subject: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 11:18:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:19:55 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 11:19:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Validate RTP addr+port passed from MNCC to MGCP MDCX In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20061 ) Change subject: msc: Validate RTP addr+port passed from MNCC to MGCP MDCX ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0b53643ed3a8f8550b2ea6e8832068d603a676e1 Gerrit-Change-Number: 20061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 11 Sep 2020 11:19:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:22:36 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 11:22:36 +0000 Subject: Change in osmo-bsc[master]: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20064 ) Change subject: gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release ...................................................................... gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release Encoding missing measurement bandwidth of LTE neighbors in Channel Release (Cell selection indicator after release of all TCH and SDCCH value part). The measurement bandwidth was encoded in the neighbors description transmitted in SI2quater while missing in the Channel Release which would overwrite the SI2quater measurement bandwidth. Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 848f623..c2f4304 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -270,8 +270,14 @@ } else { bitvec_set_bit(&bv, 1); bitvec_set_uint(&bv, e->arfcn[i], 16); - /* No "Measurement Bandwidth" */ - bitvec_set_bit(&bv, 0); + + /* Measurement Bandwidth: 9.1.54 */ + if (OSMO_EARFCN_MEAS_INVALID == e->meas_bw[i]) + bitvec_set_bit(&bv, 0); + else { + bitvec_set_bit(&bv, 1); + bitvec_set_uint(&bv, e->meas_bw[i], 3); + } /* No "Not Allowed Cells" */ bitvec_set_bit(&bv, 0); /* No "TARGET_PCID" */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4847d840ba9d5ac56bd00e4f405dc47792008c0d Gerrit-Change-Number: 20064 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:23:02 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 11:23:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix whitespace typo In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20068 ) Change subject: BSC_Tests: fix whitespace typo ...................................................................... BSC_Tests: fix whitespace typo Change-Id: I68d7b6ef1d35b798f66a04bce4de29fdd75ff7f1 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4c45028..2eb9b24 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7400,7 +7400,7 @@ execute( TC_si2quater_48_earfcns() ); execute( TC_si2quater_49_earfcns() ); execute( TC_si_acc_rotate() ); - execute (TC_si_acc_ramp_rotate() ); + execute( TC_si_acc_ramp_rotate() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68d7b6ef1d35b798f66a04bce4de29fdd75ff7f1 Gerrit-Change-Number: 20068 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:34:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 11:34:01 +0000 Subject: Change in osmo-trx[master]: proto_trxd: cosmetic: 'if' is not a function, add space References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/20075 ) Change subject: proto_trxd: cosmetic: 'if' is not a function, add space ...................................................................... proto_trxd: cosmetic: 'if' is not a function, add space Change-Id: I99cf10662232b1f6845d4019dd3b9be45a82d85b --- M Transceiver52M/proto_trxd.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/20075/1 diff --git a/Transceiver52M/proto_trxd.c b/Transceiver52M/proto_trxd.c index fbc0b14..e5a889d 100644 --- a/Transceiver52M/proto_trxd.c +++ b/Transceiver52M/proto_trxd.c @@ -69,7 +69,7 @@ int rc; /* v0 doesn't support idle frames, they are simply dropped, not sent */ - if(bi->idle) + if (bi->idle) return true; /* +2: Historically (OpenBTS times), two extra non-used bytes are sent appended to each burst */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I99cf10662232b1f6845d4019dd3b9be45a82d85b Gerrit-Change-Number: 20075 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:34:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 11:34:02 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/20076 ) Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In the multi-ARFCN mode, if the Tx/Rx antenna names are explicitly set in 'chan N' sections of the configuration file: trx ... multi-arfcn disable chan 0 tx-path TX/RX rx-path RX2 chan 1 tx-path TX/RX rx-path RX2 chan 2 tx-path TX/RX rx-path RX2 osmo-trx would crash, because radioDevice::set_antennas() would attempt to configure antenna names for all N physical channels, while USRP devices usually have 2 or even 1 available. The easiest approach is to remove both 'tx-path'/'rx-path' from all 'chan N' sections excluding 'chan 0', so it would work fine. This makes sense, because in the multi-ARFCN mode we actually use only one physical channel. However, let's still make sure that explicit configuration of the Tx/Rx antenna names would not crash osmo-trx and skip N > 0 in radioDevice::set_antennas(). Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Related: OS#4636 --- M Transceiver52M/device/common/radioDevice.h 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/76/20076/1 diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index cfe65da..56b6aa9 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -181,9 +181,12 @@ } bool set_antennas() { + unsigned int tx_paths_len; + unsigned int rx_paths_len; unsigned int i; - for (i = 0; i < tx_paths.size(); i++) { + tx_paths_len = (iface == MULTI_ARFCN) ? 1 : tx_paths.size(); + for (i = 0; i < tx_paths_len; i++) { if (tx_paths[i] == "") continue; LOGCHAN(i, DDEV, DEBUG) << "Configuring Tx antenna " << tx_paths[i]; @@ -193,7 +196,8 @@ } } - for (i = 0; i < rx_paths.size(); i++) { + rx_paths_len = (iface == MULTI_ARFCN) ? 1 : rx_paths.size(); + for (i = 0; i < rx_paths_len; i++) { if (rx_paths[i] == "") continue; LOGCHAN(i, DDEV, DEBUG) << "Configuring Rx antenna " << rx_paths[i]; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 11:34:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 11:34:02 +0000 Subject: Change in osmo-trx[master]: vty: add multi-ARFCN specific warning for chan N > 0 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/20077 ) Change subject: vty: add multi-ARFCN specific warning for chan N > 0 ...................................................................... vty: add multi-ARFCN specific warning for chan N > 0 Change-Id: I12d7c466a9a428a384233c4377627e262f165401 Related: OS#4636 --- M CommonLibs/trx_vty.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/77/20077/1 diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 1cf4f5a..3fcf888 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -520,6 +520,12 @@ { struct trx_chan *chan = vty->index; + if (chan->trx->cfg.multi_arfcn && chan->idx > 0) { + vty_out(vty, "%% Setting 'rx-path' for chan %u in multi-ARFCN mode " + "does not make sense, because only chan 0 is used%s", + chan->idx, VTY_NEWLINE); + } + osmo_talloc_replace_string(chan->trx, &chan->rx_path, argv[0]); return CMD_SUCCESS; @@ -532,6 +538,12 @@ { struct trx_chan *chan = vty->index; + if (chan->trx->cfg.multi_arfcn && chan->idx > 0) { + vty_out(vty, "%% Setting 'tx-path' for chan %u in multi-ARFCN mode " + "does not make sense, because only chan 0 is used%s", + chan->idx, VTY_NEWLINE); + } + osmo_talloc_replace_string(chan->trx, &chan->tx_path, argv[0]); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I12d7c466a9a428a384233c4377627e262f165401 Gerrit-Change-Number: 20077 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:13:49 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 12:13:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: check for the same measurement bandwidth as in SI2quater o... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 ) Change subject: BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069/1/bsc/BSC_Tests.ttcn at 2225 PS1, Line 2225: cells[i] := tr_CellSelIndValue_EUTRAN_Descr(earfcn, '1'B, 3); Add a comment that this must match the meas parameter in the vty command in f_test_si2quater() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 Gerrit-Change-Number: 20069 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Sep 2020 12:13:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:24:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 12:24:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: do not add redundant padding In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 ) Change subject: library/PCUIF_Types: version 10: do not add redundant padding ...................................................................... Patch Set 3: Hi Harald, > Patch Set 3: > > why is it redundant? It was originally added to make sure the messages are the same length as when sent by the C implementation. the problem is that padding makes ENCDEC messages unreadable in the logs generated by ttcn3-pcu-test. Sometimes it's useful to look at raw binary PDU before decoding / after decoding, and with the recent changes you would need to locate a ~8 octets long payload in >700 octets. Given that osmo-pcu does not require a message to be exactly N octets long, I think it's safe not to add padding at all. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a532d7abff8af354e40c5d706bb882efc6f905f Gerrit-Change-Number: 19570 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:24:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:26:21 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:26:21 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 to look at the new patch set (#3). Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a remote_proto to define the given protocol. IPPROTO is more universal than address_family and is defined by an RFC. IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or unused entry. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:28:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:28:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: add missing bound of nrf In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 to look at the new patch set (#2). Change subject: PCU_Tests_NS: add missing bound of nrf ...................................................................... PCU_Tests_NS: add missing bound of nrf Otherwise it will try to use setverdict() with an unbound PDU Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 --- M pcu/RAW_NS.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/20002/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 Gerrit-Change-Number: 20002 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:28:54 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:28:54 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19419 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 2: > Patch Set 2: Code-Review-1 > > I'm sorry but I'm really disliking the use of IPPROTO here, it makes no sense to use it here (since the define is about IP over IP), it's confusing and using those instead of defining them in the protocol header makes the protocol depend on some header for no good reason. > > Either use AF_INET(6) which can be passed nicely over a unix socket, or define our own PCU protocol defines for PROTO_IPv4 and PROTO_IPv6. Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:28:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:30:19 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:30:19 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 to look at the new patch set (#4). Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:32:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:32:56 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 to look at the new patch set (#5). Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:35:54 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:35:54 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 to look at the new patch set (#3). Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/19419/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:35:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:35:56 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 to look at the new patch set (#6). Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:38:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 12:38:29 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19418/6/include/osmo-bts/pcuif_proto.h File include/osmo-bts/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bts/+/19418/6/include/osmo-bts/pcuif_proto.h at 17 PS6, Line 17: transmit unrelated change, please submit a separate patch, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 12:38:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:39:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 12:39:27 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19418/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/19418/6//COMMIT_MSG at 7 PS6, Line 7: support for NSVC IPv6 support who supports the support? ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 12:39:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:40:39 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:40:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: check for the same measurement bandwidth as in SI2quater o... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 ) Change subject: BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069/1/bsc/BSC_Tests.ttcn at 2225 PS1, Line 2225: cells[i] := tr_CellSelIndValue_EUTRAN_Descr(earfcn, '1'B, 3); > Add a comment that this must match the meas parameter in the vty command in f_test_si2quater() The whole test case is already dependent on the vty + config. I've added a comment. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 Gerrit-Change-Number: 20069 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Sep 2020 12:40:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:40:50 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:40:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: check for the same measurement bandwidth as in SI2quater o... In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 to look at the new patch set (#2). Change subject: BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release ...................................................................... BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release osmo-bsc is using the same LTE neighbors of the SI2quater in the Channel Release - Cell selection indicator after release of all TCH and SDCCH IE. Ensure the same measurement bandwidth is present to not overwrite the measurements bandwidth from the SI2quater. Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/20069/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 Gerrit-Change-Number: 20069 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:44:04 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:44:04 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 to look at the new patch set (#7). Change subject: pcuif_proto: version 0xa: add support for IPv6 NSVCs ...................................................................... pcuif_proto: version 0xa: add support for IPv6 NSVCs Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:44:45 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 12:44:45 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 to look at the new patch set (#4). Change subject: pcuif_proto: version 0xa: add support for IPv6 NSVCs ...................................................................... pcuif_proto: version 0xa: add support for IPv6 NSVCs Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/19419/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:45:57 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 12:45:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: check for the same measurement bandwidth as in SI2quater o... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 ) Change subject: BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 Gerrit-Change-Number: 20069 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Sep 2020 12:45:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:48:05 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 11 Sep 2020 12:48:05 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: flush channel request queue on RSL bootstrap In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20066 to look at the new patch set (#2). Change subject: abis_rsl.c: flush channel request queue on RSL bootstrap ...................................................................... abis_rsl.c: flush channel request queue on RSL bootstrap When RSL link is bootstrapped the BSC should clear the channel request queue. Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Related: OS#4549 --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/osmo_bsc_main.c 3 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/20066/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Gerrit-Change-Number: 20066 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:48:05 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 11 Sep 2020 12:48:05 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: inform user when expired channel requests get tossed In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20067 to look at the new patch set (#2). Change subject: abis_rsl: inform user when expired channel requests get tossed ...................................................................... abis_rsl: inform user when expired channel requests get tossed At the moment expired channel requests are dropped silently, however, it might help to know when this happens - not only for debugging. Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Related: OS#4549 --- 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/67/20067/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Gerrit-Change-Number: 20067 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:48:05 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 11 Sep 2020 12:48:05 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: fix memleak in rach dos reduction function References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20078 ) Change subject: abis_rsl: fix memleak in rach dos reduction function ...................................................................... abis_rsl: fix memleak in rach dos reduction function The function reduce_rach_dos() only removes the tossed channel requests from the list, but does not free them. Change-Id: I0a62fc897c07e118dd637b156b6f2822c44db731 Related: OS#4549 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/20078/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 347be12..2af01d9 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1389,6 +1389,7 @@ "(ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", rqd->ref.ra, bts->network->neci, rqd->reason); llist_del(&rqd->entry); + talloc_free(rqd); } else { rqd_count++; } @@ -1398,7 +1399,9 @@ * problem with RACH dos on this BTS. We drop the first entry in the list to clip the growth of the list. */ if (rqd_count > 255) { LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: more than 255 queued RACH requests -- RACH DoS attack?\n"); - llist_del(&llist_first_entry(&bts->chan_rqd_queue, struct chan_rqd, entry)->entry); + rqd = llist_first_entry(&bts->chan_rqd_queue, struct chan_rqd, entry); + llist_del(&rqd->entry); + talloc_free(rqd); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0a62fc897c07e118dd637b156b6f2822c44db731 Gerrit-Change-Number: 20078 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:52:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:52:04 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20076 ) Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... Patch Set 1: Code-Review+1 it might be good to document this somewhere outside the commit log. Maybe add a sentence to the multi-arfcn section of the manual? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:52:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:52:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:52:18 +0000 Subject: Change in osmo-trx[master]: proto_trxd: cosmetic: 'if' is not a function, add space In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20075 ) Change subject: proto_trxd: cosmetic: 'if' is not a function, add space ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I99cf10662232b1f6845d4019dd3b9be45a82d85b Gerrit-Change-Number: 20075 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 11 Sep 2020 12:52:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:52:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:52:36 +0000 Subject: Change in osmo-trx[master]: vty: add multi-ARFCN specific warning for chan N > 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20077 ) Change subject: vty: add multi-ARFCN specific warning for chan N > 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I12d7c466a9a428a384233c4377627e262f165401 Gerrit-Change-Number: 20077 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:52:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:52:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:52:49 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20076 ) Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... Patch Set 1: Code-Review+2 nevermind. the VTY warning should be enough -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:52:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:53:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:53:14 +0000 Subject: Change in osmo-trx[master]: [cosmetic] radioIntefaceMulti: Fix whitespace / indent In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20073 ) Change subject: [cosmetic] radioIntefaceMulti: Fix whitespace / indent ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3addb844a79a8f4e8af03323fc50e57b8a3590a8 Gerrit-Change-Number: 20073 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Sep 2020 12:53:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:53:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:53:18 +0000 Subject: Change in osmo-trx[master]: [cosmetic] radioInterfaceMulti: More comments In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20072 ) Change subject: [cosmetic] radioInterfaceMulti: More comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If608627a77c39b5faabc72c7dd72d00fae8697a9 Gerrit-Change-Number: 20072 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:53:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:53:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:53:22 +0000 Subject: Change in osmo-trx[master]: [cosmetic] radioInterfaceMulti: More comments In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20072 ) Change subject: [cosmetic] radioInterfaceMulti: More comments ...................................................................... [cosmetic] radioInterfaceMulti: More comments Change-Id: If608627a77c39b5faabc72c7dd72d00fae8697a9 --- M Transceiver52M/radioInterfaceMulti.cpp 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 29f85ca..e654184 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -38,6 +38,7 @@ /* Universal resampling parameters */ #define NUMCHUNKS 24 +/* number of narrow-band virtual ARFCNs in this wide-band multi-ARFCN device */ #define MCHANS 4 RadioInterfaceMulti::RadioInterfaceMulti(RadioDevice *radio, size_t tx_sps, @@ -79,6 +80,10 @@ RadioInterface::close(); } +/*! we re-map the physical channels from the filter bank to logical per-TRX channels + * \param[in] pchan physical channel number within the channelizer + * \param[in] chans total number of narrow-band ARFCN channels + * \returns logical (TRX) channel number, or -1 in case there is none */ static int getLogicalChan(size_t pchan, size_t chans) { switch (chans) { @@ -113,6 +118,9 @@ return -1; } +/*! do we need to frequency shift our spectrum or not? + * \param chans total number of channels + * \returns 1 if we need to shift; 0 if not; -1 on error */ static int getFreqShift(size_t chans) { switch (chans) { @@ -154,6 +162,7 @@ tx_freq_state.resize(mChans); active.resize(MCHANS, false); + /* 4 == sps */ inchunk = RESAMP_INRATE * 4; outchunk = RESAMP_OUTRATE * 4; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If608627a77c39b5faabc72c7dd72d00fae8697a9 Gerrit-Change-Number: 20072 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:53:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:53:22 +0000 Subject: Change in osmo-trx[master]: [cosmetic] radioIntefaceMulti: Fix whitespace / indent In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20073 ) Change subject: [cosmetic] radioIntefaceMulti: Fix whitespace / indent ...................................................................... [cosmetic] radioIntefaceMulti: Fix whitespace / indent Change-Id: I3addb844a79a8f4e8af03323fc50e57b8a3590a8 --- M Transceiver52M/radioInterfaceMulti.cpp 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: lynxis lazus: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index e654184..1ca3fbb 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -440,14 +440,13 @@ double RadioInterfaceMulti::setRxGain(double db, size_t chan) { - if (chan == 0) - return mDevice->setRxGain(db); - else - return mDevice->getRxGain(); + if (chan == 0) + return mDevice->setRxGain(db); + else + return mDevice->getRxGain(); } int RadioInterfaceMulti::setPowerAttenuation(int atten, size_t chan) { - return RadioInterface::setPowerAttenuation(atten, 0); - + return RadioInterface::setPowerAttenuation(atten, 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3addb844a79a8f4e8af03323fc50e57b8a3590a8 Gerrit-Change-Number: 20073 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:53:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:53:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: check for the same measurement bandwidth as in SI2quater o... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 ) Change subject: BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 Gerrit-Change-Number: 20069 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 11 Sep 2020 12:53:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:54:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:54:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: check for the same measurement bandwidth as in SI2quater o... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 ) Change subject: BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release ...................................................................... BSC_Tests: check for the same measurement bandwidth as in SI2quater on Channel Release osmo-bsc is using the same LTE neighbors of the SI2quater in the Channel Release - Cell selection indicator after release of all TCH and SDCCH IE. Ensure the same measurement bandwidth is present to not overwrite the measurements bandwidth from the SI2quater. Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 2eb9b24..540d88f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2220,9 +2220,10 @@ { var template CellSelIndValue_EUTRAN_Descrs cells := {}; + /* the lte neighbors must match the config & vty to pass this test */ for (var integer i := 0; i < count; i := i + 1) { var integer earfcn := f_test_si2quater_earfcn_by_idx(i); - cells[i] := tr_CellSelIndValue_EUTRAN_Descr(earfcn, meas_bw_presence := '0'B, meas_bw := omit); + cells[i] := tr_CellSelIndValue_EUTRAN_Descr(earfcn, '1'B, 3); } return tr_CellSelIndValue_EUTRAN(cells); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9aa30dfd1e2c1b80e037bd71ebc4cdd3752638b4 Gerrit-Change-Number: 20069 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:54:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:54:44 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: flush channel request queue on RSL bootstrap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20066 ) Change subject: abis_rsl.c: flush channel request queue on RSL bootstrap ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Gerrit-Change-Number: 20066 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 12:54:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:55:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:55:16 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: inform user when expired channel requests get tossed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20067 ) Change subject: abis_rsl: inform user when expired channel requests get tossed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Gerrit-Change-Number: 20067 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 12:55:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:55:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:55:45 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: fix memleak in rach dos reduction function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20078 ) Change subject: abis_rsl: fix memleak in rach dos reduction function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0a62fc897c07e118dd637b156b6f2822c44db731 Gerrit-Change-Number: 20078 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 11 Sep 2020 12:55:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:56:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:56:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: add missing bound of nrf In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 ) Change subject: PCU_Tests_NS: add missing bound of nrf ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 Gerrit-Change-Number: 20002 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:56:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:56:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:56:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: add missing bound of nrf In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 ) Change subject: PCU_Tests_NS: add missing bound of nrf ...................................................................... PCU_Tests_NS: add missing bound of nrf Otherwise it will try to use setverdict() with an unbound PDU Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 --- M pcu/RAW_NS.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn index 15a0226..ec484ba 100644 --- a/pcu/RAW_NS.ttcn +++ b/pcu/RAW_NS.ttcn @@ -72,7 +72,7 @@ log("f_ns_exp() expecting ", exp_rx); alt { [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } - [] NSCP[idx].receive { + [] NSCP[idx].receive(t_NS_RecvFrom(?)) -> value nrf { setverdict(fail, "Received unexpected NS: ", nrf); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 Gerrit-Change-Number: 20002 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:57:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:57:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: do not add redundant padding In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 ) Change subject: library/PCUIF_Types: version 10: do not add redundant padding ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a532d7abff8af354e40c5d706bb882efc6f905f Gerrit-Change-Number: 19570 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 12:57:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:58:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:58:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: do not add redundant padding In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 ) Change subject: library/PCUIF_Types: version 10: do not add redundant padding ...................................................................... library/PCUIF_Types: version 10: do not add redundant padding Change-Id: I7a532d7abff8af354e40c5d706bb882efc6f905f --- M library/PCUIF_Types.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index b400267..8ce8885 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -310,7 +310,6 @@ time_ind, msg_type = PCU_IF_MSG_TIME_IND; pag_req, msg_type = PCU_IF_MSG_PAG_REQ; app_info_req, msg_type = PCU_IF_MSG_APP_INFO_REQ)" - variant "PADDING(1696)" /* 212 * 8 */ }; external function enc_PCUIF_Message(in PCUIF_Message pdu) return octetstring -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a532d7abff8af354e40c5d706bb882efc6f905f Gerrit-Change-Number: 19570 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:58:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:58:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: verify NSVC IPv4/IPv6 in the INFO.ind message In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421 ) Change subject: BTS_Tests: verify NSVC IPv4/IPv6 in the INFO.ind message ...................................................................... BTS_Tests: verify NSVC IPv4/IPv6 in the INFO.ind message Change-Id: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 Tweaked-By: Vadim Yanitskiy Related: SYS#4915 --- M bts/BTS_Tests.ttcn 1 file changed, 52 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d9ad45b..6412022 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -35,6 +35,7 @@ import from L1CTL_Types all; import from LAPDm_Types all; import from LAPDm_RAW_PT all; +import from Native_Functions all; import from Osmocom_CTRL_Adapter all; import from Osmocom_CTRL_Functions all; @@ -5435,6 +5436,55 @@ } } +/* Verify IPv4 NSVC address in the INFO.ind message (version >= 10) */ +testcase TC_pcu_socket_nsvc_ipv4() runs on test_CT { + f_init_vty_bsc(); + f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip 127.127.127.127"); + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(); + + var PCUIF_RemoteAddr remote_addr := g_pcu_last_info.u.info_ind.remote_addr; + if (not ischosen(remote_addr.v10)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected remote_addr: ", remote_addr)); + } + + if (remote_addr.v10.addr_type[0] != PCUIF_ADDR_TYPE_IPV4) { + setverdict(fail, "Received address family is not IPv4"); + } + + if (substr(remote_addr.v10.addr[0], 0, 4) != f_inet_addr("127.127.127.127")) { + setverdict(fail, "Unexpected address: ", remote_addr.v10.addr[0]); + } + + setverdict(pass); +} + +/* Verify IPv4 NSVC address in the INFO.ind message (version >= 10) */ +testcase TC_pcu_socket_nsvc_ipv6() runs on test_CT { + f_init_vty_bsc(); + f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip fd00::ca:ff:ee"); + + f_init(); + + var PCUIF_RemoteAddr remote_addr := g_pcu_last_info.u.info_ind.remote_addr; + if (not ischosen(remote_addr.v10)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected remote_addr: ", remote_addr)); + } + + if (remote_addr.v10.addr_type[0] != PCUIF_ADDR_TYPE_IPV6) { + setverdict(fail, "Received address family is not IPv6"); + } + + if (remote_addr.v10.addr[0] != f_inet6_addr("fd00::ca:ff:ee")) { + setverdict(fail, "Unexpected address: ", remote_addr.v10.addr[0]); + } + + setverdict(pass); +} + /*********************************************************************** * Osmocom Style Dynamic Timeslot Support ***********************************************************************/ @@ -6839,6 +6889,8 @@ if (PCUIF_Types.mp_pcuif_version >= 10) { execute( TC_pcu_info_ind_fh_params() ); + execute( TC_pcu_socket_nsvc_ipv4() ); + execute( TC_pcu_socket_nsvc_ipv6() ); } } else { log("PCU socket path not available, skipping PCU tests"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 Gerrit-Change-Number: 19421 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:59:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:59:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 ) Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b Gerrit-Change-Number: 20056 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 12:59:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:59:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:59:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Validate RTP addr+port passed from MNCC to MGCP MDCX In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20061 ) Change subject: msc: Validate RTP addr+port passed from MNCC to MGCP MDCX ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0b53643ed3a8f8550b2ea6e8832068d603a676e1 Gerrit-Change-Number: 20061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:59:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 12:59:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 12:59:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: sip: Set & validate IP addresses and ports In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20065 ) Change subject: WIP: sip: Set & validate IP addresses and ports ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie382f31b8b414daf598220c2e1b325b821129a40 Gerrit-Change-Number: 20065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 12:59:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:00:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 13:00:20 +0000 Subject: Change in osmo-pcu[master]: encoding: fix gen_freq_params(): do not check pdch twice In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20060 ) Change subject: encoding: fix gen_freq_params(): do not check pdch twice ...................................................................... encoding: fix gen_freq_params(): do not check pdch twice This is a left-over from an earlier version of [1] that makes Coverity think that there can be NULL pointer dereference, even despite we assert(pdch != NULL). [1] I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f Change-Id: I3490c38e0c1186dfd2fae63526a05c694547cebb Fixes: CID#214230 --- M src/encoding.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index ecf40de..d581fe9 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -565,7 +565,7 @@ freq_params->TSC = pdch->tsc; /* If frequency hopping is not in use, encode a single ARFCN */ - if (pdch == NULL || !pdch->fh.enabled) { + if (!pdch->fh.enabled) { freq_params->UnionType = 0x00; freq_params->u.ARFCN = tbf->trx->arfcn; return; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3490c38e0c1186dfd2fae63526a05c694547cebb Gerrit-Change-Number: 20060 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:00:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 13:00:25 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for IPv6 NSVCs ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 13:00:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:00:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 13:00:53 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19419 ) Change subject: pcuif_proto: version 0xa: add support for IPv6 NSVCs ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 13:00:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:01:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 13:01:51 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: flush channel request queue on RSL bootstrap In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20066 ) Change subject: abis_rsl.c: flush channel request queue on RSL bootstrap ...................................................................... abis_rsl.c: flush channel request queue on RSL bootstrap When RSL link is bootstrapped the BSC should clear the channel request queue. Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Related: OS#4549 --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/osmo_bsc_main.c 3 files changed, 16 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 9879497..964e282 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -119,6 +119,7 @@ int rsl_tx_rf_chan_release(struct gsm_lchan *lchan); void abis_rsl_chan_rqd_queue_poll(struct gsm_bts *bts); +void abis_rsl_chan_rqd_queue_flush(struct gsm_bts *bts); #endif /* RSL_MT_H */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 74cc760..c0907c0 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1398,6 +1398,18 @@ } } +/* Flush all channel requests pending on this BTS */ +void abis_rsl_chan_rqd_queue_flush(struct gsm_bts *bts) +{ + struct chan_rqd *rqd; + struct chan_rqd *rqd_tmp; + + llist_for_each_entry_safe(rqd, rqd_tmp, &bts->chan_rqd_queue, entry) { + llist_del(&rqd->entry); + talloc_free(rqd); + } +} + /* MS has requested a channel on the RACH */ static int rsl_rx_chan_rqd(struct msgb *msg) { diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 560f8fd..6d835ba 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -329,6 +329,9 @@ /* Start CBCH transmit timer if CBCH is present */ if (trx->nr == 0 && gsm_bts_get_cbch(trx->bts)) bts_cbch_timer_schedule(trx->bts); + + /* Drop all expired channel requests in the list */ + abis_rsl_chan_rqd_queue_flush(trx->bts); } static void all_ts_dispatch_event(struct gsm_bts_trx *trx, uint32_t event) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefb333817033e8d376184b58d89b186d875b968f Gerrit-Change-Number: 20066 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:01:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 13:01:51 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: inform user when expired channel requests get tossed In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20067 ) Change subject: abis_rsl: inform user when expired channel requests get tossed ...................................................................... abis_rsl: inform user when expired channel requests get tossed At the moment expired channel requests are dropped silently, however, it might help to know when this happens - not only for debugging. Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Related: OS#4549 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index c0907c0..347be12 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1384,10 +1384,14 @@ llist_for_each_entry_safe(rqd, rqd_tmp, &bts->chan_rqd_queue, entry) { /* If the channel request is older than the radio link timeout we drop it. This also means that the * queue is under its overflow limit again. */ - if (timestamp_current - rqd->timestamp > rlt) + if (timestamp_current - rqd->timestamp > rlt) { + LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: tossing expired channel request" + "(ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", + rqd->ref.ra, bts->network->neci, rqd->reason); llist_del(&rqd->entry); - else + } else { rqd_count++; + } } /* If we find more than 255 (256) unexpired channel requests in the queue it is very likely that there is a -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib49df551a4cd7d5652e85c8ce29ef132385d4ae4 Gerrit-Change-Number: 20067 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:01:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 13:01:51 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: fix memleak in rach dos reduction function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20078 ) Change subject: abis_rsl: fix memleak in rach dos reduction function ...................................................................... abis_rsl: fix memleak in rach dos reduction function The function reduce_rach_dos() only removes the tossed channel requests from the list, but does not free them. Change-Id: I0a62fc897c07e118dd637b156b6f2822c44db731 Related: OS#4549 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 347be12..2af01d9 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1389,6 +1389,7 @@ "(ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", rqd->ref.ra, bts->network->neci, rqd->reason); llist_del(&rqd->entry); + talloc_free(rqd); } else { rqd_count++; } @@ -1398,7 +1399,9 @@ * problem with RACH dos on this BTS. We drop the first entry in the list to clip the growth of the list. */ if (rqd_count > 255) { LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: more than 255 queued RACH requests -- RACH DoS attack?\n"); - llist_del(&llist_first_entry(&bts->chan_rqd_queue, struct chan_rqd, entry)->entry); + rqd = llist_first_entry(&bts->chan_rqd_queue, struct chan_rqd, entry); + llist_del(&rqd->entry); + talloc_free(rqd); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0a62fc897c07e118dd637b156b6f2822c44db731 Gerrit-Change-Number: 20078 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:02:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 13:02:09 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for IPv6 NSVCs ...................................................................... Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19418/6/include/osmo-bts/pcuif_proto.h File include/osmo-bts/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bts/+/19418/6/include/osmo-bts/pcuif_proto.h at 17 PS6, Line 17: transmit > unrelated change, please submit a separate patch, thanks! this is still not addressed, but ok, not critical... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 13:02:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:02:10 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 13:02:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: add missing bound of nrf In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 ) Change subject: PCU_Tests_NS: add missing bound of nrf ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieafe9017126dd293aad09dad3c8a4180c9c29fa0 Gerrit-Change-Number: 20002 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 13:02:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:14:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 13:14:40 +0000 Subject: Change in libosmocore[master]: vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20079 ) Change subject: vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() ...................................................................... vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() Change-Id: I49549439d5bbfbb83954ba92957304b03062d003 Fixes: CID#212137 --- M src/vty/cpu_sched_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/20079/1 diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index f608738..35671a9 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -175,7 +175,7 @@ if (CPU_ISSET_S(cpu + 3, cpuset_size, cpuset)) val |= 0x08; - if (val >= 0 && val < 10) + if (val < 10) *ptr = '0' + val; else *ptr = ('a' - 10) + val; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I49549439d5bbfbb83954ba92957304b03062d003 Gerrit-Change-Number: 20079 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:18:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 13:18:30 +0000 Subject: Change in osmo-bsc[master]: vty: clarify NM state owner printed by 'show trx N' command References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20080 ) Change subject: vty: clarify NM state owner printed by 'show trx N' command ...................................................................... vty: clarify NM state owner printed by 'show trx N' command Change-Id: Ib17d1e98cfa1f293cf76cd9614722b6dec538960 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/20080/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 3524506..e0e6e3e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1198,7 +1198,7 @@ "resulting BS power: %d dBm%s", trx->nominal_power, trx->max_power_red, trx->nominal_power - trx->max_power_red, VTY_NEWLINE); - vty_out(vty, " NM State: "); + vty_out(vty, " Radio Carrier NM State: "); net_dump_nmstate(vty, &trx->mo.nm_state); if (print_rsl) vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib17d1e98cfa1f293cf76cd9614722b6dec538960 Gerrit-Change-Number: 20080 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:20:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 13:20:54 +0000 Subject: Change in osmo-e1d[master]: make sure a given timeslot can only be opened once (by default) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20081 ) Change subject: make sure a given timeslot can only be opened once (by default) ...................................................................... make sure a given timeslot can only be opened once (by default) Align the behavior of osmo-e1d with that of DAHDI: If a timeslot is opened once, it cannot be opened again by anyone until it is closed by the current owner. This way we'd have the same failure semantics in DAHDI vs. osmo-e1d, which is very useful in case of misconfiguration when osmo-bsc + osmo-mgw would "fight" over a timeslot. Add a osmo_e1dp_client_ts_open_force() function that allows to override and get back the original behavior. Closes: OS#4654 Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto_clnt.c 4 files changed, 36 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/81/20081/1 diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 5628e31..6457f14 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -81,6 +81,8 @@ E1DP_TSMODE_HDLCFCS = 0x11, }; +/* osmo_e1dp_ts_config.flags */ +#define E1DP_TS_OPEN_F_FORCE 0x80 /* the idea here is to use the first byte as a version number, to prevent incompatible * clients from connecting to e1d */ @@ -118,6 +120,7 @@ struct osmo_e1dp_ts_config { uint8_t mode; + uint8_t flags; uint16_t read_bufsize; } __attribute__((packed)); diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index 5a4f965..1473716 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -46,3 +46,6 @@ int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize); +int osmo_e1dp_client_ts_open_force(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, uint8_t ts, + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize); diff --git a/src/ctl.c b/src/ctl.c index 8da21fd..8a0e339 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -395,8 +395,16 @@ return 0; } - /* If already open, close previous */ - e1_ts_stop(ts); + if (ts->fd >= 0) { + /* we only force-reopen a busy timeslot if the flag is set */ + if (cfg->flags & E1DP_TS_OPEN_F_FORCE) { + e1_ts_stop(ts); + } else { + LOGPTS(ts, DE1D, LOGL_ERROR, + "Timeslot already open, rejecting re-open without F_FORCE\n"); + return 0; + } + } /* Init */ ret = _e1d_ts_start(ts, mode, cfg->read_bufsize); diff --git a/src/proto_clnt.c b/src/proto_clnt.c index 69c7234..0f6e367 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -315,10 +315,10 @@ return 0; } -int -osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, +static int +_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, - enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize, uint8_t flags) { struct msgb *msgb; struct osmo_e1dp_msg_hdr hdr; @@ -333,6 +333,7 @@ memset(&cfg, 0x00, sizeof(struct osmo_e1dp_ts_config)); cfg.mode = mode; + cfg.flags = flags; cfg.read_bufsize = read_bufsize; tsfd = -1; @@ -348,3 +349,19 @@ return tsfd; } + +int +osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, uint8_t ts, + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) +{ + return _client_ts_open(clnt, intf, line, ts, mode, read_bufsize, 0); +} + +int +osmo_e1dp_client_ts_open_force(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, uint8_t ts, + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) +{ + return _client_ts_open(clnt, intf, line, ts, mode, read_bufsize, E1DP_TS_OPEN_F_FORCE); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 Gerrit-Change-Number: 20081 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:28:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 13:28:57 +0000 Subject: Change in osmo-bsc[master]: abis_nm: make a HACK in abis_nm_ipaccess_cgi() less confusing References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20082 ) Change subject: abis_nm: make a HACK in abis_nm_ipaccess_cgi() less confusing ...................................................................... abis_nm: make a HACK in abis_nm_ipaccess_cgi() less confusing Change-Id: Ideed271ca7453e98d153deb8aa0aefa7020b75ec Fixes: CID#208178 --- M src/osmo-bsc/abis_nm.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/20082/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index d88ce24..01b304e 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -3014,10 +3014,11 @@ { struct gsm48_ra_id *_buf = (struct gsm48_ra_id*)buf; uint16_t ci = htons(bts->cell_identity); - /* we simply reuse the GSM48 function and write the Cell ID over the position where the RAC - * starts */ + + /* HACK: we simply reuse the existing GSM48 function and write + * the Cell ID over the position where the RAC starts. */ gsm48_ra_id_by_bts(_buf, bts); - memcpy(&_buf->rac, &ci, sizeof(ci)); + memcpy(buf + sizeof(struct gsm48_ra_id) - 1, &ci, sizeof(ci)); } static const struct value_string ipacc_testres_names[] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ideed271ca7453e98d153deb8aa0aefa7020b75ec Gerrit-Change-Number: 20082 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:38:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 13:38:08 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: fix a crash when receiving a RACH LOAD IND with 0 References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20083 ) Change subject: osmo-bsc: fix a crash when receiving a RACH LOAD IND with 0 ...................................................................... osmo-bsc: fix a crash when receiving a RACH LOAD IND with 0 Change-Id: Ia395d4ec70107688856ef0cd5daa6124a7da834b --- M src/osmo-bsc/abis_rsl.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/20083/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 74cc760..550de06 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1713,8 +1713,14 @@ sd.rach_busy_count = rslh->data[4] << 8 | rslh->data[5]; sd.rach_access_count = rslh->data[6] << 8 | rslh->data[7]; /* update stats group */ - busy_percent = (int32_t) sd.rach_busy_count * 100 / (int32_t) sd.rach_slot_count; - access_percent = (int32_t) sd.rach_access_count * 100 / (int32_t) sd.rach_slot_count; + if (sd.rach_slot_count) { + access_percent = (int32_t) sd.rach_access_count * 100 / (int32_t) sd.rach_slot_count; + busy_percent = (int32_t) sd.rach_busy_count * 100 / (int32_t) sd.rach_slot_count; + } else { + access_percent = 0; + busy_percent = 0; + } + osmo_stat_item_set(sd.bts->bts_statg->items[BTS_STAT_RACH_BUSY], busy_percent); osmo_stat_item_set(sd.bts->bts_statg->items[BTS_STAT_RACH_ACCESS], access_percent); /* dispatch signal */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia395d4ec70107688856ef0cd5daa6124a7da834b Gerrit-Change-Number: 20083 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:40:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 13:40:27 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#25). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,133 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/25 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 25 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 13:45:31 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 13:45:31 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#26). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 6,129 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/26 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 26 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 14:10:41 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 11 Sep 2020 14:10:41 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 26: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h at 222 PS24, Line 222: static inline int ns2_is_sns(uint8_t pdu_type) Unused function https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h at 227 PS24, Line 227: static inline int ns2_is_ns(uint8_t pdu_type) Unused -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 26 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 14:10:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 14:25:30 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 14:25:30 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 to look at the new patch set (#8). Change subject: pcuif_proto: version 0xa: add support for IPv6 NSVCs ...................................................................... pcuif_proto: version 0xa: add support for IPv6 NSVCs Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 14:26:40 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 14:26:40 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: fix a crash when receiving a RACH LOAD IND with 0 In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20083 ) Change subject: osmo-bsc: fix a crash when receiving a RACH LOAD IND with 0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20083/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20083/1/src/osmo-bsc/abis_rsl.c at 1720 PS1, Line 1720: access_percent = 0; Should it 0 or 100%? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia395d4ec70107688856ef0cd5daa6124a7da834b Gerrit-Change-Number: 20083 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 11 Sep 2020 14:26:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 14:27:44 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 14:27:44 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: fix typo in comment References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20084 ) Change subject: pcuif_proto: fix typo in comment ...................................................................... pcuif_proto: fix typo in comment Change-Id: Iec7c41741ed093df8c60a3cda548662492f56116 --- M include/osmo-bts/pcuif_proto.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20084/1 diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 30449c5..983a4c4 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -14,7 +14,7 @@ #define PCU_IF_MSG_DATA_CNF 0x01 /* confirm (e.g. transmission on PCH) */ #define PCU_IF_MSG_DATA_IND 0x02 /* receive data from given channel */ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ -#define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to tranmit APP INFO via PACCH */ +#define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ #define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (with direct tlli) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iec7c41741ed093df8c60a3cda548662492f56116 Gerrit-Change-Number: 20084 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 15:01:28 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 11 Sep 2020 15:01:28 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: improve manual activation of lchans (debug / labtest) References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20085 ) Change subject: bsc_vty: improve manual activation of lchans (debug / labtest) ...................................................................... bsc_vty: improve manual activation of lchans (debug / labtest) The VTY already has a method available to activate lchans manually, however, this method does not support proper activation of signalling channels. Also additional commands to activate multiple lchans at once are helpful to make labtesting simpler and more efficient. Change-Id: I66b874736c8c456eb82ccc26d5209987d8ed706c Related: SYS#4910 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 215 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/20085/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 3524506..f7039f4 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5033,15 +5033,118 @@ return vty_rc; } +/* Activate / Deactivate a single lchan with a specific codec mode */ +static int lchan_act_single(struct vty *vty, struct gsm_lchan *lchan, const char *codec_str, int amr_mode, int activate) +{ + if (activate) { + int lchan_t; + if (lchan->fi->state != LCHAN_ST_UNUSED) { + vty_out(vty, "%% Cannot activate: Channel busy!%s", VTY_NEWLINE); + return CMD_WARNING; + } + lchan_t = gsm_lchan_type_by_pchan(lchan->ts->pchan_is); + if (lchan_t < 0) { + vty_out(vty, "%% Cannot activate: Invalid lchan type!%s", VTY_NEWLINE); + return CMD_WARNING; + } + /* configure the lchan */ + lchan->type = lchan_t; + if (!strcmp(codec_str, "hr") || !strcmp(codec_str, "fr")) { + lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; + lchan->tch_mode = GSM48_CMODE_SPEECH_V1; + } else if (!strcmp(codec_str, "efr")) { + lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; + lchan->tch_mode = GSM48_CMODE_SPEECH_EFR; + } else if (!strcmp(codec_str, "amr")) { + int vty_rc; + lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; + if (amr_mode == -1) { + vty_out(vty, "%% AMR requires specification of AMR mode%s", VTY_NEWLINE); + return CMD_WARNING; + } + lchan->tch_mode = GSM48_CMODE_SPEECH_AMR; + vty_rc = lchan_set_single_amr_mode(vty, lchan, amr_mode); + if (vty_rc != CMD_SUCCESS) { + vty_out(vty, "%% Failed to set AMR mode (%i)%s", amr_mode, VTY_NEWLINE); + return vty_rc; + } + } else if (!strcmp(codec_str, "sig")) { + lchan->rsl_cmode = RSL_CMOD_SPD_SIGN; + lchan->tch_mode = GSM48_CMODE_SIGN; + } else { + vty_out(vty, "%% Invalid channel mode specified!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + vty_out(vty, "%% activating lchan %s as %s%s", gsm_lchan_name(lchan), gsm_chan_t_name(lchan->type), + VTY_NEWLINE); + rsl_tx_chan_activ(lchan, RSL_ACT_TYPE_INITIAL, 0); + + if ((lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H) + && is_ipaccess_bts(lchan->ts->trx->bts)) + rsl_tx_ipacc_crcx(lchan); + } else { + if (!lchan->fi) { + vty_out(vty, "%% Cannot release: Channel not initialized%s", VTY_NEWLINE); + return CMD_WARNING; + } + vty_out(vty, "%% Asking for release of %s in state %s%s", gsm_lchan_name(lchan), + osmo_fsm_inst_state_name(lchan->fi), VTY_NEWLINE); + lchan_release(lchan, !!(lchan->conn), false, 0); + } + + return CMD_SUCCESS; +} + +/* Activate / Deactivate a single lchan with a specific codec mode */ +static int lchan_act_trx(struct vty *vty, struct gsm_bts_trx *trx, int activate) +{ + int ts_nr; + struct gsm_bts_trx_ts *ts; + struct gsm_lchan *lchan; + char *codec_str; + + for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { + ts = &trx->ts[ts_nr]; + ts_for_each_lchan(lchan, ts) { + switch (ts->pchan_is) { + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + case GSM_PCHAN_CCCH: + case GSM_PCHAN_CCCH_SDCCH4: + codec_str = "sig"; + break; + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_F_PDCH: + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + codec_str = "fr"; + break; + case GSM_PCHAN_TCH_H: + codec_str = "hr"; + break; + default: + codec_str = NULL; + vty_out(vty, "%% omitting lchan %s%s", gsm_lchan_name(lchan), VTY_NEWLINE); + } + + if (codec_str) + lchan_act_single(vty, lchan, codec_str, -1, activate); + } + } + + return CMD_SUCCESS; +} + /* Debug/Measurement command to activate a given logical channel * manually in a given mode/codec. This is useful for receiver * performance testing (FER/RBER/...) */ DEFUN(lchan_act, lchan_act_cmd, - "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> (activate|deactivate) (hr|fr|efr|amr) [<0-7>]", + "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> (activate|deactivate) (hr|fr|efr|amr|sig) [<0-7>]", BTS_NR_TRX_TS_SS_STR2 "Manual Channel Activation (e.g. for BER test)\n" "Manual Channel Deactivation (e.g. for BER test)\n" - "Half-Rate v1\n" "Full-Rate\n" "Enhanced Full Rate\n" "Adaptive Multi-Rate\n" "AMR Mode\n") + "Half-Rate v1\n" "Full-Rate\n" "Enhanced Full Rate\n" "Adaptive Multi-Rate\n" "Signalling\n" "AMR Mode\n") { struct gsm_bts_trx_ts *ts; struct gsm_lchan *lchan; @@ -5049,6 +5152,10 @@ const char *act_str = argv[4]; const char *codec_str = argv[5]; int activate; + int amr_mode = -1; + + if (argc > 6) + amr_mode = atoi(argv[6]); ts = vty_get_ts(vty, argv[0], argv[1], argv[2]); if (!ts) @@ -5069,51 +5176,115 @@ return CMD_WARNING; } - if (activate) { - int lchan_t; - if (lchan->fi->state != LCHAN_ST_UNUSED) { - vty_out(vty, "%% Cannot activate: Channel busy!%s", VTY_NEWLINE); - return CMD_WARNING; + return lchan_act_single(vty, lchan, codec_str, amr_mode, activate); +} + +#define ACTIVATE_ALL_LCHANS_STR "Manual Channel Activation of all logical channels (e.g. for BER test)\n" +#define DEACTIVATE_ALL_LCHANS_STR "Manual Channel Deactivation of all logical channels (e.g. for BER test)\n" + +/* Similar to lchan_act, but activates all lchans on the network at once, + * this is intended to perform lab tests / measurements. */ +DEFUN_HIDDEN(lchan_act_bts, lchan_act_all_cmd, + "(activate-all-lchan|deactivate-all-lchan)", + ACTIVATE_ALL_LCHANS_STR + DEACTIVATE_ALL_LCHANS_STR) +{ + struct gsm_network *net = gsmnet_from_vty(vty); + const char *act_str = argv[0]; + int activate; + int bts_nr; + struct gsm_bts *bts; + int trx_nr; + struct gsm_bts_trx *trx; + + if (!strcmp(act_str, "activate-all-lchan")) + activate = 1; + else + activate = 0; + + for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { + bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr); + for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { + trx = gsm_bts_trx_num(bts, trx_nr); + lchan_act_trx(vty, trx, activate); } - lchan_t = gsm_lchan_type_by_pchan(ts->pchan_is); - if (lchan_t < 0) - return CMD_WARNING; - /* configure the lchan */ - lchan->type = lchan_t; - lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; - if (!strcmp(codec_str, "hr") || !strcmp(codec_str, "fr")) - lchan->tch_mode = GSM48_CMODE_SPEECH_V1; - else if (!strcmp(codec_str, "efr")) - lchan->tch_mode = GSM48_CMODE_SPEECH_EFR; - else if (!strcmp(codec_str, "amr")) { - int amr_mode, vty_rc; - if (argc < 7) { - vty_out(vty, "%% AMR requires specification of AMR mode%s", VTY_NEWLINE); - return CMD_WARNING; - } - amr_mode = atoi(argv[6]); - lchan->tch_mode = GSM48_CMODE_SPEECH_AMR; - vty_rc = lchan_set_single_amr_mode(vty, lchan, amr_mode); - if (vty_rc != CMD_SUCCESS) - return vty_rc; - } - vty_out(vty, "%% activating lchan %s%s", gsm_lchan_name(lchan), VTY_NEWLINE); - rsl_tx_chan_activ(lchan, RSL_ACT_TYPE_INITIAL, 0); - if (is_ipaccess_bts(lchan->ts->trx->bts)) - rsl_tx_ipacc_crcx(lchan); - } else { - if (!lchan->fi) { - vty_out(vty, "%% Cannot release: Channel not initialized%s", VTY_NEWLINE); - return CMD_WARNING; - } - vty_out(vty, "%% Asking for release of %s in state %s%s", gsm_lchan_name(lchan), - osmo_fsm_inst_state_name(lchan->fi), VTY_NEWLINE); - lchan_release(lchan, !!(lchan->conn), false, 0); } return CMD_SUCCESS; } +/* Similar to lchan_act, but activates all lchans on the specified BTS at once, + * this is intended to perform lab tests / measurements. */ +DEFUN_HIDDEN(lchan_act_all_bts, lchan_act_all_bts_cmd, + "bts <0-255> (activate-all-lchan|deactivate-all-lchan)", + "BTS Specific Commands\n" BTS_NR_STR + ACTIVATE_ALL_LCHANS_STR + DEACTIVATE_ALL_LCHANS_STR) +{ + int bts_nr = atoi(argv[0]); + const char *act_str = argv[1]; + int activate; + struct gsm_bts *bts; + int trx_nr; + struct gsm_bts_trx *trx; + + if (!strcmp(act_str, "activate-all-lchan")) + activate = 1; + else + activate = 0; + + bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr); + if (!bts) { + vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + } + + for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { + trx = gsm_bts_trx_num(bts, trx_nr); + lchan_act_trx(vty, trx, activate); + } + + return CMD_SUCCESS; +} + +/* Similar to lchan_act, but activates all lchans on the specified BTS at once, + * this is intended to perform lab tests / measurements. */ +DEFUN_HIDDEN(lchan_act_all_trx, lchan_act_all_trx_cmd, + "bts <0-255> trx <0-255> (activate-all-lchan|deactivate-all-lchan)", + "BTS for manual command\n" BTS_NR_STR + "TRX for manual command\n" TRX_NR_STR + ACTIVATE_ALL_LCHANS_STR + DEACTIVATE_ALL_LCHANS_STR) +{ + int bts_nr = atoi(argv[0]); + int trx_nr = atoi(argv[1]); + const char *act_str = argv[2]; + int activate; + struct gsm_bts *bts; + struct gsm_bts_trx *trx; + + if (!strcmp(act_str, "activate-all-lchan")) + activate = 1; + else + activate = 0; + + bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr); + if (!bts) { + vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + } + + trx = gsm_bts_trx_num(bts, trx_nr); + if (!bts) { + vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE); + return CMD_WARNING; + } + + lchan_act_trx(vty, trx, activate); + + return CMD_SUCCESS; +} + /* Debug command to send lchans from state LCHAN_ST_UNUSED to state * LCHAN_ST_BORKEN and vice versa. */ DEFUN_HIDDEN(lchan_set_borken, lchan_set_borken_cmd, @@ -6592,6 +6763,9 @@ install_element(ENABLE_NODE, &bts_resend_cmd); install_element(ENABLE_NODE, &pdch_act_cmd); install_element(ENABLE_NODE, &lchan_act_cmd); + install_element(ENABLE_NODE, &lchan_act_all_cmd); + install_element(ENABLE_NODE, &lchan_act_all_bts_cmd); + install_element(ENABLE_NODE, &lchan_act_all_trx_cmd); install_element(ENABLE_NODE, &lchan_mdcx_cmd); install_element(ENABLE_NODE, &lchan_set_borken_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I66b874736c8c456eb82ccc26d5209987d8ed706c Gerrit-Change-Number: 20085 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 15:38:44 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 11 Sep 2020 15:38:44 +0000 Subject: Change in osmo-e1d[master]: make sure a given timeslot can only be opened once (by default) In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20081 ) Change subject: make sure a given timeslot can only be opened once (by default) ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Looks good except for the protocol version number needing a bump. https://gerrit.osmocom.org/c/osmo-e1d/+/20081/1/include/osmocom/e1d/proto.h File include/osmocom/e1d/proto.h: https://gerrit.osmocom.org/c/osmo-e1d/+/20081/1/include/osmocom/e1d/proto.h at 89 PS1, Line 89: #define E1DP_MAGIC 0x01e1 This breaks protocol compatibility and so the version number needs a bump. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 Gerrit-Change-Number: 20081 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Fri, 11 Sep 2020 15:38:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 15:39:23 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 11 Sep 2020 15:39:23 +0000 Subject: Change in osmo-e1d[master]: src/ctl.c: Log NOTICE messages whenever client send unexpected requests In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20074 ) Change subject: src/ctl.c: Log NOTICE messages whenever client send unexpected requests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icd47de13ab84b89ce5fb21c24713bae760611d32 Gerrit-Change-Number: 20074 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Fri, 11 Sep 2020 15:39:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 15:43:10 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 11 Sep 2020 15:43:10 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add support for osmo-e1d In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19929 ) Change subject: e1-prbs-test: Add support for osmo-e1d ...................................................................... Patch Set 2: Code-Review+1 Looks good. At some point it'd be nice if neither dahdi / e1d was _required_ to build (so you can build on a machine with just e1d or one with just dahdi). -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 Gerrit-Change-Number: 19929 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Fri, 11 Sep 2020 15:43:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 16:16:06 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 11 Sep 2020 16:16:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set verdict to pass when TC_emerg_premption is done References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20086 ) Change subject: BSC_Tests: set verdict to pass when TC_emerg_premption is done ...................................................................... BSC_Tests: set verdict to pass when TC_emerg_premption is done The testcase TC_emerg_premption does not set a verdict when done. Make sure that the verdict is set to pass when the test is done. Change-Id: Ie612b32cfa9cedd1e0f1d51e48911da94ec325cf Related: OS#4549 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/20086/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 540d88f..d0ecb12 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6840,6 +6840,8 @@ chan_nr := rx_rsl.ies[0].body.chan_nr; f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 33)); rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); + + setverdict(pass); } /* Hopping parameters per a timeslot */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie612b32cfa9cedd1e0f1d51e48911da94ec325cf Gerrit-Change-Number: 20086 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 16:56:29 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 16:56:29 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#27). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M src/logging.c 16 files changed, 6,171 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/27 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 27 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 17:01:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 17:01:18 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#28). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M src/logging.c M tests/logging/logging_vty_test.vty 17 files changed, 6,172 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/28 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 28 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 17:11:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 17:11:11 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#29). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M src/logging.c M tests/logging/logging_vty_test.vty 17 files changed, 6,174 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/29 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 29 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 17:17:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 17:17:08 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Patch Set 29: (8 comments) I think I've implemented all the requested review. It's still not perfect, but I think we should go for a merge. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 346 PS24, Line 346: llist_add(&nsvc->list, &nse->nsvc); > Ack Done https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2.c at 882 PS24, Line 882: static bool gprs_fsm_vc_registered = false; > I think we usually use constructors to register GFSM and all that. No strong opinion though. Done https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h at 222 PS24, Line 222: static inline int ns2_is_sns(uint8_t pdu_type) > Unused function Done https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h at 222 PS24, Line 222: static inline int ns2_is_sns(uint8_t pdu_type) > Unused function Done https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h at 227 PS24, Line 227: static inline int ns2_is_ns(uint8_t pdu_type) > Unused Done https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_internal.h at 227 PS24, Line 227: static inline int ns2_is_ns(uint8_t pdu_type) > Unused Done https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c File src/gb/gprs_ns2_message.c: https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c at 43 PS24, Line 43: #define ERR_IF_NSVC_USES_SNS(nsvc, reason) \ > i'll remove this I've implemented the macro as it meant. https://gerrit.osmocom.org/c/libosmocore/+/19417/24/src/gb/gprs_ns2_message.c at 64 PS24, Line 64: int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) > If 0 means success and 1 error, usually we return negative values. [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 29 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 17:17:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 17:52:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 17:52:22 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 ) Change subject: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib1be00f73146519c8cc78bb08dd26a110771cd55 Gerrit-Change-Number: 20017 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 17:52:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:34:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 11 Sep 2020 18:34:28 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 ) Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl File src/ipa_proto.erl: https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl at 97 PS1, Line 97: set_ccm_options This looks like a public API, so we don't you -export() it? https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl at 257 PS1, Line 257: Result Cosmetic: you could embed ipa_proto:request() call here: case ipa_proto:request(Request) of ... -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 18:34:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:42:24 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:42:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 to look at the new patch set (#2). Change subject: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port ...................................................................... RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port In preparation for the SGSN tests allow to change the source udp port for every test case. Change-Id: I465ad2c8580e74cce4dab46f4ec29a9043df9938 --- M pcu/RAW_NS.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/20009/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I465ad2c8580e74cce4dab46f4ec29a9043df9938 Gerrit-Change-Number: 20009 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:42:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:42:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: GSM_Types: fix extra indention tab References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20087 ) Change subject: library: GSM_Types: fix extra indention tab ...................................................................... library: GSM_Types: fix extra indention tab The top level context doesn't have an indent. Change-Id: Ifece2e9fa782f173665e10fa9174403cccac7eb6 --- M library/GSM_Types.ttcn 1 file changed, 202 insertions(+), 202 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/20087/1 diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 8625cc3..5340fee 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -12,223 +12,223 @@ module GSM_Types { - import from General_Types all; - import from Osmocom_Types all; +import from General_Types all; +import from Osmocom_Types all; - type integer GsmArfcn (0..1023); - type integer UmtsArfcn (0..16383); - type integer UmtsScramblingCode (0..511); - const integer GsmMaxFrameNumber := 26*51*2048; - type integer GsmFrameNumber (0..GsmMaxFrameNumber); - type integer GsmRxLev (0..63); - type integer GsmTsc (0..7) with { variant "FIELDLENGTH(8)" }; - type uint32_t GsmTmsi; - type OCT4 GprsTlli; - type hexstring GsmMcc length(3); - type hexstring GsmMnc length(2 .. 3); - type uint16_t GsmLac; - type uint16_t GsmCellId; +type integer GsmArfcn (0..1023); +type integer UmtsArfcn (0..16383); +type integer UmtsScramblingCode (0..511); +const integer GsmMaxFrameNumber := 26*51*2048; +type integer GsmFrameNumber (0..GsmMaxFrameNumber); +type integer GsmRxLev (0..63); +type integer GsmTsc (0..7) with { variant "FIELDLENGTH(8)" }; +type uint32_t GsmTmsi; +type OCT4 GprsTlli; +type hexstring GsmMcc length(3); +type hexstring GsmMnc length(2 .. 3); +type uint16_t GsmLac; +type uint16_t GsmCellId; - type enumerated GprsCodingScheme { - CS1, CS2, CS3, CS4 - }; +type enumerated GprsCodingScheme { + CS1, CS2, CS3, CS4 +}; - function f_gprs_blocksize(GprsCodingScheme cs) return integer { - select (cs) { - case (CS1) { return 22 } - case (CS2) { return 32 } - case (CS3) { return 38 } - case (CS3) { return 52 } - case else { - setverdict(fail, "Invalid GPRS CS ", cs); - mtc.stop; - } +function f_gprs_blocksize(GprsCodingScheme cs) return integer { + select (cs) { + case (CS1) { return 22 } + case (CS2) { return 32 } + case (CS3) { return 38 } + case (CS3) { return 52 } + case else { + setverdict(fail, "Invalid GPRS CS ", cs); + mtc.stop; } } +} - /* 10.5.2.8 */ - type enumerated ChannelNeeded { - CHAN_NEED_ANY (0), - CHAN_NEED_SDCCH (1), - CHAN_NEED_TCH_F (2), - CHAN_NEED_TCH_H (3) - } with { variant "FIELDLENGTH(2)" }; - type record ChannelNeeded12 { - ChannelNeeded second, - ChannelNeeded first - } with { variant "" }; +/* 10.5.2.8 */ +type enumerated ChannelNeeded { + CHAN_NEED_ANY (0), + CHAN_NEED_SDCCH (1), + CHAN_NEED_TCH_F (2), + CHAN_NEED_TCH_H (3) +} with { variant "FIELDLENGTH(2)" }; +type record ChannelNeeded12 { + ChannelNeeded second, + ChannelNeeded first +} with { variant "" }; - /* TS 48.058 9.3.1 Channel Number IE */ - type enumerated RslChanNr0 { - RSL_CHAN_NR_INVALID ('00000'B), - RSL_CHAN_NR_Bm_ACCH ('00001'B), - RSL_CHAN_NR_BCCH ('10000'B), - RSL_CHAN_NR_RACH ('10001'B), - RSL_CHAN_NR_PCH_AGCH ('10010'B), - RSL_CHAN_NR_OSMO_PDCH ('11000'B), - RSL_CHAN_NR_OSMO_CBCH4 ('11001'B), - RSL_CHAN_NR_OSMO_CBCH8 ('11010'B) - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +/* TS 48.058 9.3.1 Channel Number IE */ +type enumerated RslChanNr0 { + RSL_CHAN_NR_INVALID ('00000'B), + RSL_CHAN_NR_Bm_ACCH ('00001'B), + RSL_CHAN_NR_BCCH ('10000'B), + RSL_CHAN_NR_RACH ('10001'B), + RSL_CHAN_NR_PCH_AGCH ('10010'B), + RSL_CHAN_NR_OSMO_PDCH ('11000'B), + RSL_CHAN_NR_OSMO_CBCH4 ('11001'B), + RSL_CHAN_NR_OSMO_CBCH8 ('11010'B) +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type record RslChanNr2 { - BIT4 tag ('0001'B), - uint1_t sub_chan - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +type record RslChanNr2 { + BIT4 tag ('0001'B), + uint1_t sub_chan +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type record RslChanNr4 { - BIT3 tag ('001'B), - uint2_t sub_chan - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +type record RslChanNr4 { + BIT3 tag ('001'B), + uint2_t sub_chan +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type record RslChanNr8 { - BIT2 tag ('01'B), - uint3_t sub_chan - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +type record RslChanNr8 { + BIT2 tag ('01'B), + uint3_t sub_chan +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type union RslChanNrU { - RslChanNr0 ch0, - RslChanNr2 lm, - RslChanNr4 sdcch4, - RslChanNr8 sdcch8 - } with { - variant "TAG(lm, tag = '0001'B; - sdcch4, tag = '001'B; - sdcch8, tag = '01'B; - ch0, OTHERWISE)" - variant "FIELDLENGTH(5)" - variant "FIELDORDER(msb)" - }; +type union RslChanNrU { + RslChanNr0 ch0, + RslChanNr2 lm, + RslChanNr4 sdcch4, + RslChanNr8 sdcch8 +} with { + variant "TAG(lm, tag = '0001'B; + sdcch4, tag = '001'B; + sdcch8, tag = '01'B; + ch0, OTHERWISE)" + variant "FIELDLENGTH(5)" + variant "FIELDORDER(msb)" +}; - type record RslChannelNr { - RslChanNrU u, - uint3_t tn - } with { variant "FIELDLENGTH(8)" variant "FIELDORDER(msb)" }; +type record RslChannelNr { + RslChanNrU u, + uint3_t tn +} with { variant "FIELDLENGTH(8)" variant "FIELDORDER(msb)" }; - template RslChannelNr t_RslChanNr0(template uint3_t tn, template RslChanNr0 cht) := { - u := { ch0 := cht }, - tn := tn +template RslChannelNr t_RslChanNr0(template uint3_t tn, template RslChanNr0 cht) := { + u := { ch0 := cht }, + tn := tn +} + +template RslChannelNr t_RslChanNr_RACH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_RACH); +template RslChannelNr t_RslChanNr_BCCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_BCCH); +template RslChannelNr t_RslChanNr_PCH_AGCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); +template RslChannelNr t_RslChanNr_Bm(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); +template RslChannelNr t_RslChanNr_PDCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); +template RslChannelNr t_RslChanNr_CBCH4(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); +template RslChannelNr t_RslChanNr_CBCH8(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); +template RslChannelNr t_RslChanNr_Lm(template uint3_t tn, template uint1_t sub_slot) := { + u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, + tn := tn +} +template RslChannelNr t_RslChanNr_SDCCH4(template uint3_t tn, template uint2_t sub_slot) := { + u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, + tn := tn +} +template RslChannelNr t_RslChanNr_SDCCH8(template uint3_t tn, template uint3_t sub_slot) := { + u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, + tn := tn +} + +template (value) RslChannelNr ts_RslChanNr0(uint3_t tn, RslChanNr0 cht) := { + u := { ch0 := cht }, + tn := tn +} +template (value) RslChannelNr ts_RslChanNr_RACH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_RACH); +template (value) RslChannelNr ts_RslChanNr_BCCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_BCCH); +template (value) RslChannelNr ts_RslChanNr_PCH_AGCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); +template (value) RslChannelNr ts_RslChanNr_Bm(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); +template (value) RslChannelNr ts_RslChanNr_PDCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); +template (value) RslChannelNr ts_RslChanNr_CBCH4(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); +template (value) RslChannelNr ts_RslChanNr_CBCH8(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); +template (value) RslChannelNr ts_RslChanNr_Lm(uint3_t tn, uint1_t sub_slot) := { + u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, + tn := tn +} +template (value) RslChannelNr ts_RslChanNr_SDCCH4(uint3_t tn, uint2_t sub_slot) := { + u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, + tn := tn +} +template (value) RslChannelNr ts_RslChanNr_SDCCH8(uint3_t tn, uint3_t sub_slot) := { + u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, + tn := tn +} + +/* TS 48.058 9.3.2 Link ID */ +type enumerated RslLinkIdC { + FACCH_SDCCH (0), + SACCH (1), + OSMO_PTCCH (2) /* Osmocom (trxcon) specific extension */ +} with { variant "FIELDLENGTH(2)" }; + +type enumerated RslSapi0Prio { + SAPI0_PRIO_NORMAL (0), + SAPI0_PRIO_HIGH (1), + SAPI0_PRIO_LOW (2) +} with { variant "FIELDLENGTH(2)" }; + +type uint3_t GsmSapi; + +type record RslLinkId { + RslLinkIdC c, + boolean na, + RslSapi0Prio prio, + GsmSapi sapi +} with { variant "" }; + +template RslLinkId tr_RslLinkId := { + c := ?, + na := ?, + prio := ?, + sapi := ? +}; + +template RslLinkId tr_RslLinkID_DCCH(template GsmSapi sapi) modifies tr_RslLinkId := { + c := FACCH_SDCCH, + na := false, + sapi := sapi +}; + +template RslLinkId tr_RslLinkID_SACCH(template GsmSapi sapi) modifies tr_RslLinkId := { + c := SACCH, + na := false, + sapi := sapi +}; + +template RslLinkId tr_RslLinkID_OSMO_PTCCH(template GsmSapi sapi) modifies tr_RslLinkId := { + c := OSMO_PTCCH, + na := false, + sapi := sapi +}; + +template (value) RslLinkId ts_RslLinkID_DCCH(GsmSapi sapi) := { + c := FACCH_SDCCH, + na := false, + prio := SAPI0_PRIO_NORMAL, + sapi := sapi +}; + +template (value) RslLinkId ts_RslLinkID_SACCH(GsmSapi sapi) := { + c := SACCH, + na := false, + prio := SAPI0_PRIO_NORMAL, + sapi := sapi +}; + +template (value) RslLinkId ts_RslLinkID_OSMO_PTCCH(GsmSapi sapi) := { + c := OSMO_PTCCH, + na := false, + prio := SAPI0_PRIO_NORMAL, + sapi := sapi +}; + +function f_hex_is_odd_length(hexstring digits) return bitstring { + if (lengthof(digits) rem 2 == 1) { + return '1'B; + } else { + return '0'B; } - - template RslChannelNr t_RslChanNr_RACH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_RACH); - template RslChannelNr t_RslChanNr_BCCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_BCCH); - template RslChannelNr t_RslChanNr_PCH_AGCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); - template RslChannelNr t_RslChanNr_Bm(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); - template RslChannelNr t_RslChanNr_PDCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); - template RslChannelNr t_RslChanNr_CBCH4(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); - template RslChannelNr t_RslChanNr_CBCH8(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); - template RslChannelNr t_RslChanNr_Lm(template uint3_t tn, template uint1_t sub_slot) := { - u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, - tn := tn - } - template RslChannelNr t_RslChanNr_SDCCH4(template uint3_t tn, template uint2_t sub_slot) := { - u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, - tn := tn - } - template RslChannelNr t_RslChanNr_SDCCH8(template uint3_t tn, template uint3_t sub_slot) := { - u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, - tn := tn - } - - template (value) RslChannelNr ts_RslChanNr0(uint3_t tn, RslChanNr0 cht) := { - u := { ch0 := cht }, - tn := tn - } - template (value) RslChannelNr ts_RslChanNr_RACH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_RACH); - template (value) RslChannelNr ts_RslChanNr_BCCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_BCCH); - template (value) RslChannelNr ts_RslChanNr_PCH_AGCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); - template (value) RslChannelNr ts_RslChanNr_Bm(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); - template (value) RslChannelNr ts_RslChanNr_PDCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); - template (value) RslChannelNr ts_RslChanNr_CBCH4(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); - template (value) RslChannelNr ts_RslChanNr_CBCH8(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); - template (value) RslChannelNr ts_RslChanNr_Lm(uint3_t tn, uint1_t sub_slot) := { - u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, - tn := tn - } - template (value) RslChannelNr ts_RslChanNr_SDCCH4(uint3_t tn, uint2_t sub_slot) := { - u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, - tn := tn - } - template (value) RslChannelNr ts_RslChanNr_SDCCH8(uint3_t tn, uint3_t sub_slot) := { - u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, - tn := tn - } - - /* TS 48.058 9.3.2 Link ID */ - type enumerated RslLinkIdC { - FACCH_SDCCH (0), - SACCH (1), - OSMO_PTCCH (2) /* Osmocom (trxcon) specific extension */ - } with { variant "FIELDLENGTH(2)" }; - - type enumerated RslSapi0Prio { - SAPI0_PRIO_NORMAL (0), - SAPI0_PRIO_HIGH (1), - SAPI0_PRIO_LOW (2) - } with { variant "FIELDLENGTH(2)" }; - - type uint3_t GsmSapi; - - type record RslLinkId { - RslLinkIdC c, - boolean na, - RslSapi0Prio prio, - GsmSapi sapi - } with { variant "" }; - - template RslLinkId tr_RslLinkId := { - c := ?, - na := ?, - prio := ?, - sapi := ? - }; - - template RslLinkId tr_RslLinkID_DCCH(template GsmSapi sapi) modifies tr_RslLinkId := { - c := FACCH_SDCCH, - na := false, - sapi := sapi - }; - - template RslLinkId tr_RslLinkID_SACCH(template GsmSapi sapi) modifies tr_RslLinkId := { - c := SACCH, - na := false, - sapi := sapi - }; - - template RslLinkId tr_RslLinkID_OSMO_PTCCH(template GsmSapi sapi) modifies tr_RslLinkId := { - c := OSMO_PTCCH, - na := false, - sapi := sapi - }; - - template (value) RslLinkId ts_RslLinkID_DCCH(GsmSapi sapi) := { - c := FACCH_SDCCH, - na := false, - prio := SAPI0_PRIO_NORMAL, - sapi := sapi - }; - - template (value) RslLinkId ts_RslLinkID_SACCH(GsmSapi sapi) := { - c := SACCH, - na := false, - prio := SAPI0_PRIO_NORMAL, - sapi := sapi - }; - - template (value) RslLinkId ts_RslLinkID_OSMO_PTCCH(GsmSapi sapi) := { - c := OSMO_PTCCH, - na := false, - prio := SAPI0_PRIO_NORMAL, - sapi := sapi - }; - - function f_hex_is_odd_length(hexstring digits) return bitstring { - if (lengthof(digits) rem 2 == 1) { - return '1'B; - } else { - return '0'B; - } - } +} /* TS 04.12 Section 3.3.1 Block type */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifece2e9fa782f173665e10fa9174403cccac7eb6 Gerrit-Change-Number: 20087 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:42:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:42:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Osmocom_Types: fix extra indention tab References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20088 ) Change subject: library: Osmocom_Types: fix extra indention tab ...................................................................... library: Osmocom_Types: fix extra indention tab The top level context doesn't have an indent. Change-Id: Ib94fa74a7752f21ba8203a5de17ce2b10d800d16 --- M library/Osmocom_Types.ttcn 1 file changed, 69 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/20088/1 diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 6281280..1993ae1 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -10,90 +10,90 @@ module Osmocom_Types { - import from General_Types all; +import from General_Types all; - type integer uint8_t (0..255) with { variant "unsigned 8 bit" }; - type integer uint16_t (0..65535) with { variant "unsigned 16 bit" }; - type integer uint24_t (0..16777215) with { variant "unsigned 24 bit" }; - type integer uint32_t (0..4294967295) with { variant "unsigned 32 bit" }; +type integer uint8_t (0..255) with { variant "unsigned 8 bit" }; +type integer uint16_t (0..65535) with { variant "unsigned 16 bit" }; +type integer uint24_t (0..16777215) with { variant "unsigned 24 bit" }; +type integer uint32_t (0..4294967295) with { variant "unsigned 32 bit" }; - type integer int8_t (-128..127) with { variant "8 bit" }; - type integer int16_t (-32768..32767) with { variant "16 bit" }; +type integer int8_t (-128..127) with { variant "8 bit" }; +type integer int16_t (-32768..32767) with { variant "16 bit" }; - type integer uint1_t (0..1) with { variant "unsigned 1 bit" }; - type integer uint2_t (0..3) with { variant "unsigned 2 bit" }; - type integer uint3_t (0..7) with { variant "unsigned 3 bit" }; - type integer uint4_t (0..15) with { variant "unsigned 4 bit" }; - type integer uint5_t (0..31) with { variant "unsigned 5 bit" }; - type integer uint6_t (0..63) with { variant "unsigned 6 bit" }; - type integer uint7_t (0..127) with { variant "unsigned 7 bit" }; - type integer uint9_t (0..511) with { variant "unsigned 9 bit" }; - type integer uint10_t (0..1023) with { variant "unsigned 10 bit" }; - type integer uint11_t (0..2047) with { variant "unsigned 11 bit" }; - type integer uint12_t (0..4095) with { variant "unsigned 12 bit" }; - type integer uint13_t (0..8191) with { variant "unsigned 13 bit" }; - type integer uint14_t (0..16383) with { variant "unsigned 14 bit" }; - type integer uint15_t (0..32767) with { variant "unsigned 15 bit" }; - type integer uint40_t (0..1099511627776) with { variant "unsigned 40 bit" }; +type integer uint1_t (0..1) with { variant "unsigned 1 bit" }; +type integer uint2_t (0..3) with { variant "unsigned 2 bit" }; +type integer uint3_t (0..7) with { variant "unsigned 3 bit" }; +type integer uint4_t (0..15) with { variant "unsigned 4 bit" }; +type integer uint5_t (0..31) with { variant "unsigned 5 bit" }; +type integer uint6_t (0..63) with { variant "unsigned 6 bit" }; +type integer uint7_t (0..127) with { variant "unsigned 7 bit" }; +type integer uint9_t (0..511) with { variant "unsigned 9 bit" }; +type integer uint10_t (0..1023) with { variant "unsigned 10 bit" }; +type integer uint11_t (0..2047) with { variant "unsigned 11 bit" }; +type integer uint12_t (0..4095) with { variant "unsigned 12 bit" }; +type integer uint13_t (0..8191) with { variant "unsigned 13 bit" }; +type integer uint14_t (0..16383) with { variant "unsigned 14 bit" }; +type integer uint15_t (0..32767) with { variant "unsigned 15 bit" }; +type integer uint40_t (0..1099511627776) with { variant "unsigned 40 bit" }; - const uint16_t c_UINT16_MAX := 65535; - const uint32_t c_UINT32_MAX := 4294967295; +const uint16_t c_UINT16_MAX := 65535; +const uint32_t c_UINT32_MAX := 4294967295; - /* CSN.1 L/H placeholders */ - const BIT1 CSN1_L := '0'B; - const BIT1 CSN1_H := '1'B; +/* CSN.1 L/H placeholders */ +const BIT1 CSN1_L := '0'B; +const BIT1 CSN1_H := '1'B; - type record Arfcn { - boolean pcs, - uint15_t arfcn - } with { variant "" }; +type record Arfcn { + boolean pcs, + uint15_t arfcn +} with { variant "" }; - /* return random integer 0 <= ret < max. According to ETSI ES 201 873 C.6.1, rnd() returns *less* than 1, so - * the returned int will always be ret < max, or ret <= (max-1). */ - function f_rnd_int(integer max) return integer { - return float2int(rnd()*int2float(max)); +/* return random integer 0 <= ret < max. According to ETSI ES 201 873 C.6.1, rnd() returns *less* than 1, so + * the returned int will always be ret < max, or ret <= (max-1). */ +function f_rnd_int(integer max) return integer { + return float2int(rnd()*int2float(max)); +} + +/* return hexstring composed of random digits */ +function f_rnd_hexstring(in integer len, in integer max := 15) return hexstring { + var integer i; + var hexstring ret := ''H; + for (i := 0; i < len; i := i + 1) { + ret := ret & int2hex(f_rnd_int(max), 1); } + return ret; +} - /* return hexstring composed of random digits */ - function f_rnd_hexstring(in integer len, in integer max := 15) return hexstring { - var integer i; - var hexstring ret := ''H; - for (i := 0; i < len; i := i + 1) { - ret := ret & int2hex(f_rnd_int(max), 1); - } - return ret; +/* return octetstring composed of random bytes */ +function f_rnd_octstring(in integer len) return octetstring { + var integer i; + var octetstring ret := ''O; + for (i := 0; i < len; i := i + 1) { + ret := ret & int2oct(f_rnd_int(255), 1); } + return ret; +} - /* return octetstring composed of random bytes */ - function f_rnd_octstring(in integer len) return octetstring { - var integer i; - var octetstring ret := ''O; - for (i := 0; i < len; i := i + 1) { - ret := ret & int2oct(f_rnd_int(255), 1); - } - return ret; - } +/* return bitstring composed of random bits */ +function f_rnd_bitstring(in integer len) return bitstring { + var octetstring oct := f_rnd_octstring(len / 8 + 1); + return substr(oct2bit(oct), 0, len); +} - /* return bitstring composed of random bits */ - function f_rnd_bitstring(in integer len) return bitstring { - var octetstring oct := f_rnd_octstring(len / 8 + 1); - return substr(oct2bit(oct), 0, len); - } +function f_rnd_imsi(in hexstring prefix) return hexstring { + return prefix & f_rnd_hexstring(15 - lengthof(prefix), 9); +} - function f_rnd_imsi(in hexstring prefix) return hexstring { - return prefix & f_rnd_hexstring(15 - lengthof(prefix), 9); - } +function f_rnd_msisdn(in octetstring prefix, integer len := 6) return octetstring { + return prefix & f_rnd_octstring(len - lengthof(prefix)); +} - function f_rnd_msisdn(in octetstring prefix, integer len := 6) return octetstring { - return prefix & f_rnd_octstring(len - lengthof(prefix)); - } - - function f_sleep(float seconds) { - timer T := seconds; - T.start; - T.timeout; - } +function f_sleep(float seconds) { + timer T := seconds; + T.start; + T.timeout; +} function bool2bit(boolean inp) return BIT1 { if (inp) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib94fa74a7752f21ba8203a5de17ce2b10d800d16 Gerrit-Change-Number: 20088 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:42:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:42:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: remove usage of mp_nsconfig References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20089 ) Change subject: RAW_NS: remove usage of mp_nsconfig ...................................................................... RAW_NS: remove usage of mp_nsconfig RAW_NS uses module parameter from SGSN_Components. To decouple RAW_NS from SGSN_Component pass the NSConfiguration via f_init_ns_codec() Change-Id: Ida8b8a6af815dc11b2ff4c65e19cc5ec25f18ae2 --- M pcu/PCU_Tests_NS.ttcn M pcu/PCU_Tests_SNS.ttcn M pcu/RAW_NS.ttcn 3 files changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/20089/1 diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index f953be4..586b1b1 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -76,7 +76,7 @@ /* test the NS-RESET procedure */ testcase TC_ns_reset() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); @@ -87,7 +87,7 @@ /* ensure NS-RESET are re-transmitted */ testcase TC_ns_reset_retrans() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); var integer i; @@ -103,7 +103,7 @@ /* test the inbound NS-ALIVE procedure after NS-RESET */ testcase TC_ns_alive() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); /* Expect inbound NS-RESET procedure */ @@ -118,7 +118,7 @@ /* Test for NS-RESET after NS-ALIVE timeout */ testcase TC_ns_alive_timeout_reset() runs on RAW_Test_CT { - f_init_ns_codec(guard_secs := 100.0); + f_init_ns_codec(mp_nsconfig, guard_secs := 100.0); f_init_pcuif(); /* Expect inbound NS-RESET procedure */ @@ -140,7 +140,7 @@ /* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */ testcase TC_ns_unblock() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); /* Expect inbound NS-RESET procedure */ @@ -155,7 +155,7 @@ /* test for NS-UNBLOCK re-transmissions */ testcase TC_ns_unblock_retrans() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); /* Expect inbound NS-RESET procedure */ @@ -174,7 +174,7 @@ /* full bring-up of the Gb link for NS and BSSGP layer up to BVC-FC */ testcase TC_ns_full_bringup() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); /* Expect inbound NS-RESET procedure */ @@ -200,7 +200,7 @@ /* test outbound (SGSN-originated) NS-BLOCK procedure */ testcase TC_ns_so_block() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); /* Expect inbound NS-RESET procedure */ diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index dd133a3..e819688 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -132,7 +132,7 @@ /* PCU-originated SNS-SIZE: successful case */ testcase TC_sns_po_size_success() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); f_incoming_sns_size(); f_sleep(1.0); @@ -141,7 +141,7 @@ /* PCU-originated SNS-SIZE: NACK from our side */ testcase TC_sns_po_size_nack() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); f_incoming_sns_size(NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED); /* FIXME: ensure we don't get a SNS-CONFIG */ @@ -152,7 +152,7 @@ /* PCU-originated SNS-CONFIG: successful case */ testcase TC_sns_po_config_success() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); f_incoming_sns_size(); f_incoming_sns_config(); @@ -162,7 +162,7 @@ /* PCU-originated SNS-CONFIG: successful case */ testcase TC_sns_po_config_nack() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); f_incoming_sns_size(); f_incoming_sns_config(NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED); @@ -174,7 +174,7 @@ /* SGSN-originated SNS-SIZE: successful case */ testcase TC_sns_so_config_success() runs on RAW_Test_CT { - f_init_ns_codec(); + f_init_ns_codec(mp_nsconfig); f_init_pcuif(); f_incoming_sns_size(); f_incoming_sns_config(); @@ -199,8 +199,8 @@ private function f_sns_bringup_1c1u(boolean sgsn_originated_reset := false) runs on RAW_Test_CT { /* Activate two NS codec ports */ - f_init_ns_codec(); - f_init_ns_codec(1); + f_init_ns_codec(mp_nsconfig); + f_init_ns_codec(mp_nsconfig, 1); f_init_pcuif(); /* Perform Size + BSS-originated config */ f_incoming_sns_size(); @@ -244,9 +244,9 @@ private function f_sns_bringup_1c1u_separate(boolean sgsn_originated_reset := false) runs on RAW_Test_CT { /* Activate two NS codec ports */ - f_init_ns_codec(); - f_init_ns_codec(1); - f_init_ns_codec(2); + f_init_ns_codec(mp_nsconfig); + f_init_ns_codec(mp_nsconfig, 1); + f_init_ns_codec(mp_nsconfig, 2); f_init_pcuif(); /* Perform Size + BSS-originated config */ f_incoming_sns_size(); @@ -303,9 +303,9 @@ /* Transmit BVC-RESET before NS-ALIVE of PCU was ACKed: expect no response */ testcase TC_sns_1c1u_so_bvc_reset_too_early() runs on RAW_Test_CT { /* Activate two NS codec ports */ - f_init_ns_codec(); - f_init_ns_codec(1); - f_init_ns_codec(2); + f_init_ns_codec(mp_nsconfig); + f_init_ns_codec(mp_nsconfig, 1); + f_init_ns_codec(mp_nsconfig, 2); f_init_pcuif(); /* Perform Size + BSS-originated config */ f_incoming_sns_size(); @@ -331,7 +331,7 @@ f_sns_bringup_1c1u(); /* crate another NS codec port on the tester side */ - f_init_ns_codec(2); + f_init_ns_codec(mp_nsconfig, 2); f_outgoing_sns_add(idx_add := 2, w_sig := 0, w_user := 1, idx := 0); diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn index 4300376..9c31820 100644 --- a/pcu/RAW_NS.ttcn +++ b/pcu/RAW_NS.ttcn @@ -38,7 +38,7 @@ } } -function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0, integer tc_offset := 0) runs on RAW_NS_CT { +function f_init_ns_codec(NSConfiguration ns_config, integer idx := 0, float guard_secs := 60.0, integer tc_offset := 0) runs on RAW_NS_CT { var Result res; if (not g_T_guard.running) { @@ -48,10 +48,10 @@ if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { /* copy most parts from mp_nsconfig */ - g_nsconfig[idx] := mp_nsconfig; + g_nsconfig[idx] := ns_config; /* adjust those parts different for each NS-VC */ - g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; - g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx + tc_offset; + g_nsconfig[idx].nsvci := ns_config.nsvci + idx; + g_nsconfig[idx].local_udp_port := ns_config.local_udp_port + idx + tc_offset; } map(self:NSCP[idx], system:NSCP); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ida8b8a6af815dc11b2ff4c65e19cc5ec25f18ae2 Gerrit-Change-Number: 20089 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:42:28 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:42:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: remove usage of mp_gb_cfg References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20090 ) Change subject: RAW_NS: remove usage of mp_gb_cfg ...................................................................... RAW_NS: remove usage of mp_gb_cfg RAW_NS uses module parameter from SGSN_Components. To decouple RAW_NS from SGSN_Component pass the cell_id via a function argument. Change-Id: I91d9db85519675054aaab83c85fac43e67391f33 --- M pcu/PCU_Tests_NS.ttcn M pcu/PCU_Tests_SNS.ttcn M pcu/RAW_NS.ttcn 3 files changed, 18 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/20090/1 diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index 586b1b1..26b81a2 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -188,8 +188,8 @@ f_outgoing_ns_alive(); /* Expect BVC-RESET for signaling (0) and ptp BVCI */ - as_rx_bvc_reset_tx_ack(0, oneshot := true); - as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true); + as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true); + as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, oneshot := true); as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true); /* wait for one FLOW-CONTROL BVC and then ACK any further in the future */ diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index e819688..192890d 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -187,8 +187,8 @@ f_outgoing_ns_alive(); /* Expect BVC-RESET for signaling (0) and ptp BVCI */ - as_rx_bvc_reset_tx_ack(0, oneshot := true); - as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true); + as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true); + as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, oneshot := true); as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true); /* wait for one FLOW-CONTROL BVC and then ACK any further in the future */ @@ -220,12 +220,12 @@ f_outgoing_ns_alive(1); if (sgsn_originated_reset) { - f_tx_bvc_reset_rx_ack(0); - f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvci); + f_tx_bvc_reset_rx_ack(0, mp_gb_cfg.cell_id); + f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id); } else { /* Expect BVC-RESET for signaling (0) and ptp BVCI */ - as_rx_bvc_reset_tx_ack(0, oneshot := true); - as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true); + as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true); + as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, oneshot := true); } /* Expect UNBLOCK for ptp BVCI on signaling NS-VC (idx==0) */ as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true); @@ -270,12 +270,12 @@ f_outgoing_ns_alive_no_ack(idx := 0); if (sgsn_originated_reset) { - f_tx_bvc_reset_rx_ack(0, idx := 1); - f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvci, idx := 1); + f_tx_bvc_reset_rx_ack(0, mp_gb_cfg.cell_id, idx := 1); + f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, idx := 1); } else { /* Expect BVC-RESET for signaling BVCI=0 and ptp BVCI */ - as_rx_bvc_reset_tx_ack(0, oneshot := true, idx := 1); - as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true, idx := 1); + as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true, idx := 1); + as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, oneshot := true, idx := 1); } /* Expect UNBLOCK for ptp BVCI on signaling NS-VC (idx==1) */ as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true, idx := 1); @@ -322,8 +322,8 @@ f_outgoing_ns_alive_no_ack(idx := 0); /* Transmit BVC-RESET and expect no ACK*/ - f_tx_bvc_reset_rx_ack(0, idx := 1, exp_ack := false); - f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvci, idx := 1, exp_ack := false); + f_tx_bvc_reset_rx_ack(0, mp_gb_cfg.cell_id, idx := 1, exp_ack := false); + f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, idx := 1, exp_ack := false); } /* Test adding new IP endpoints at runtime */ diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn index 9c31820..d02f4ca 100644 --- a/pcu/RAW_NS.ttcn +++ b/pcu/RAW_NS.ttcn @@ -12,7 +12,6 @@ import from General_Types all; import from Osmocom_Types all; -import from SGSN_Components all; import from Osmocom_Gb_Types all; import from NS_CodecPort all; import from NS_Types all; @@ -139,10 +138,10 @@ } /* Transmit BSSGP RESET for given BVCI and expect ACK */ -function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) +function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, BssgpCellId cell_id, integer idx := 0, boolean exp_ack := true) runs on RAW_NS_CT { var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, - mp_gb_cfg.cell_id)); + cell_id)); timer T := 5.0; NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); T.start; @@ -162,14 +161,14 @@ } /* Receive a BSSGP RESET for given BVCI and ACK it */ -altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { +altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, BssgpCellId cell_id, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { var NS_RecvFrom ns_rf; /* FIXME: nail down received cell_id in match */ [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, bvci, ?)))) -> value ns_rf { var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, cell_id)); NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); if (not oneshot) { repeat; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I91d9db85519675054aaab83c85fac43e67391f33 Gerrit-Change-Number: 20090 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:42:28 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:42:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: migrate RAW_NS to library Osmocom_RAW_NS References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 ) Change subject: migrate RAW_NS to library Osmocom_RAW_NS ...................................................................... migrate RAW_NS to library Osmocom_RAW_NS Osmocom_RAW_NS will be used by the PCU and the SGSN NS tests. Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 --- R library/Osmocom_RAW_NS.ttcn M pcu/PCU_Tests_NS.ttcn M pcu/PCU_Tests_SNS.ttcn M pcu/gen_links.sh 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/20091/1 diff --git a/pcu/RAW_NS.ttcn b/library/Osmocom_RAW_NS.ttcn similarity index 99% rename from pcu/RAW_NS.ttcn rename to library/Osmocom_RAW_NS.ttcn index d02f4ca..28f06fe 100644 --- a/pcu/RAW_NS.ttcn +++ b/library/Osmocom_RAW_NS.ttcn @@ -1,4 +1,4 @@ -module RAW_NS { +module Osmocom_RAW_NS { /* Osmocom NS test suite for NS in TTCN-3 * (C) 2018-2019 Harald Welte diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index 26b81a2..8e69794 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -26,7 +26,7 @@ import from IPL4asp_Types all; import from PCUIF_Types all; import from PCUIF_CodecPort all; -import from RAW_NS all; +import from Osmocom_RAW_NS all; type component RAW_PCU_CT { /* PCUIF (we emulate the BTS part) */ diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 192890d..b64aa61 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -16,7 +16,7 @@ import from Osmocom_Gb_Types all; import from NS_CodecPort all; import from NS_Types all; -import from RAW_NS all; +import from Osmocom_RAW_NS all; /********************************************************************************** * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index 3a52c99..8433d06 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -53,7 +53,7 @@ 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 " -FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn " +FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn Osmocom_RAW_NS.ttcn" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 Gerrit-Change-Number: 20091 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:43:31 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:43:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 to look at the new patch set (#2). Change subject: SGSN: introduce NS tests ...................................................................... SGSN: introduce NS tests Similiar to the PCU_Tests_NS introduce SGSN_Tests_NS. Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 --- M sgsn/SGSN_Tests.ttcn A sgsn/SGSN_Tests_NS.cfg A sgsn/SGSN_Tests_NS.ttcn M sgsn/gen_links.sh 4 files changed, 101 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/20008/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 18:44:47 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 18:44:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 ) Change subject: SGSN: introduce NS tests ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008/1/sgsn/gen_links.sh File sgsn/gen_links.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008/1/sgsn/gen_links.sh at 98 PS1, Line 98: : DIR=../pcu : FILES="RAW_NS.ttcn SGSN_Components.ttcn GPRS_Context.ttcn " : gen_links $DIR $FILES > The others are a dependency of RAW_NS. I'ven't checked how deep the dependency goes. [?] I've removed the dependencies and moved RAW_NS to library. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 18:44:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 19:12:21 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 11 Sep 2020 19:12:21 +0000 Subject: Change in osmo-mgw[master]: mgcp_network: fix coverity false positive References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20092 ) Change subject: mgcp_network: fix coverity false positive ...................................................................... mgcp_network: fix coverity false positive The function recvfrom gets a struct sockaddr *src_addr and a socklen_t *addrlen parameter. The addrlen parameter specifies the length of src_addr, which is 16 bytes, but we give it the size of struct osmo_sockaddr instead, which is much longer. This is not problematic, but for some reason coverity detects a memory corruption, so lets give the actual size of struct sockaddr as input instead. Change-Id: I14f22d161c242ae518009679b584f983e0b63ca0 Fixes: CID 214229 --- 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/92/20092/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index fa40f1f..b3919f3 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1412,7 +1412,7 @@ struct mgcp_conn_rtp *conn_src; struct mgcp_endpoint *endp; struct osmo_sockaddr addr; - socklen_t slen = sizeof(addr); + socklen_t slen = sizeof(addr.u.sa); char ipbuf[INET6_ADDRSTRLEN]; int ret; enum rtp_proto proto; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I14f22d161c242ae518009679b584f983e0b63ca0 Gerrit-Change-Number: 20092 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 19:32:03 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 11 Sep 2020 19:32:03 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20093 ) Change subject: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() ...................................................................... gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() The function gsm48_rx_cm_reest_req() is the only one where the return code of osmo_mobile_identity_decode_from_l3() is not checked, lets check it here too. Change-Id: I37981205870b094b3a40a20197461208daa62698 Fixes: CID#211037 --- M src/libmsc/gsm_04_08.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/20093/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 6bd82d0..e313bfd 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -825,7 +825,12 @@ static int gsm48_rx_cm_reest_req(struct msc_a *msc_a, struct msgb *msg) { struct osmo_mobile_identity mi; - osmo_mobile_identity_decode_from_l3(&mi, msg, false); + int rc = osmo_mobile_identity_decode_from_l3(&mi, msg, false); + if (rc) { + LOGP(DMM, LOGL_ERROR, "CM ESTABLISHMENT REQUEST: cannot decode Mobile Identity\n"); + return -EINVAL; + } + DEBUGP(DMM, "<- CM RE-ESTABLISH REQUEST %s\n", osmo_mobile_identity_to_str_c(OTC_SELECT, &mi)); /* we don't support CM call re-establishment */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37981205870b094b3a40a20197461208daa62698 Gerrit-Change-Number: 20093 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:38:40 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 11 Sep 2020 20:38:40 +0000 Subject: Change in pysim[master]: cards.py: Populate AIDs present in SysmoISIMSJA2 UICC References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20094 ) Change subject: cards.py: Populate AIDs present in SysmoISIMSJA2 UICC ...................................................................... cards.py: Populate AIDs present in SysmoISIMSJA2 UICC Change-Id: I5f00aa9b03b41818aaa95291fe6c1e525bb0571f --- M pySim/cards.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/94/20094/1 diff --git a/pySim/cards.py b/pySim/cards.py index 2971d45..76d405b 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1152,6 +1152,9 @@ r = self._scc.select_file(['3f00', '7f10']) data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True) + # Populate AIDs + self.read_aids() + # update EF-SIM_AUTH_KEY (and EF-USIM_AUTH_KEY_2G, which is # hard linked to EF-USIM_AUTH_KEY) self._scc.select_file(['3f00']) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5f00aa9b03b41818aaa95291fe6c1e525bb0571f Gerrit-Change-Number: 20094 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:38:41 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 11 Sep 2020 20:38:41 +0000 Subject: Change in pysim[master]: Use the function select_adf_by_aid for selecting an AID References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20095 ) Change subject: Use the function select_adf_by_aid for selecting an AID ...................................................................... Use the function select_adf_by_aid for selecting an AID Basically, the idea is to read all the AIDs on the UICC once rather than reading each time we want to select an ADF. The function select_adf_by_aid select the ADF by its AID which is already populated by read_aids() function Change-Id: I5e0e87e9cf238922d60fda7a7836e65f91f2c233 --- M pySim/cards.py 1 file changed, 2 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/20095/1 diff --git a/pySim/cards.py b/pySim/cards.py index 76d405b..d1b449a 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1165,20 +1165,14 @@ self._scc.update_binary('6f20', p['opc'], 17) # update EF-USIM_AUTH_KEY in ADF.ISIM - self._scc.select_file(['3f00']) - aid = self.read_aid(isim = True) - if (aid): - self._scc.select_adf(aid) + if '9000' == self.select_adf_by_aid(adf="isim"): if p.get('ki'): self._scc.update_binary('af20', p['ki'], 1) if p.get('opc'): self._scc.update_binary('af20', p['opc'], 17) - self._scc.select_file(['3f00']) - aid = self.read_aid() - if (aid): + if '9000' == self.select_adf_by_aid(): # update EF-USIM_AUTH_KEY in ADF.USIM - self._scc.select_adf(aid) if p.get('ki'): self._scc.update_binary('af20', p['ki'], 1) if p.get('opc'): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5e0e87e9cf238922d60fda7a7836e65f91f2c233 Gerrit-Change-Number: 20095 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:38:41 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 11 Sep 2020 20:38:41 +0000 Subject: Change in pysim[master]: Remove redundant function read_aid() References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20096 ) Change subject: Remove redundant function read_aid() ...................................................................... Remove redundant function read_aid() Change-Id: I46c4ac0b994db7fb5c3113175009175ec5c154e3 --- M pySim/cards.py 1 file changed, 0 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/20096/1 diff --git a/pySim/cards.py b/pySim/cards.py index d1b449a..eeeae82 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -204,30 +204,6 @@ else: return (None, sw) - # Read the (full) AID for either ISIM or USIM or ISIM application - def read_aid(self, isim = False): - - # First (known) halves of the AID - aid_usim = "a0000000871002" - aid_isim = "a0000000871004" - - # Select which one to look for - if isim: - aid = aid_isim - else: - aid = aid_usim - - # Find out how many records the EF.DIR has, then go through - # all records and try to find the AID we are looking for - aid_record_count = self._scc.record_count(['2F00']) - for i in range(0, aid_record_count): - record = self._scc.read_record(['2F00'], i + 1) - if aid in record[0]: - aid_len = int(record[0][6:8], 16) - return record[0][8:8 + aid_len * 2] - - return None - # Fetch all the AIDs present on UICC def read_aids(self): try: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46c4ac0b994db7fb5c3113175009175ec5c154e3 Gerrit-Change-Number: 20096 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:48:09 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 11 Sep 2020 20:48:09 +0000 Subject: Change in pysim[master]: cards.py: Populate AIDs present in SysmoISIMSJA2 UICC In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20094 ) Change subject: cards.py: Populate AIDs present in SysmoISIMSJA2 UICC ...................................................................... Patch Set 1: > Build Failed > > https://jenkins.osmocom.org/jenkins/job/gerrit-pysim/571/ : FAILURE Can someone please confirm whether the ADM pin for SysmoISIMSJA2 is correct or not? Reference: (https://gerrit.osmocom.org/#/c/pysim/+/20070/1/pysim-testdata/sysmoISIM-SJA2.data) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5f00aa9b03b41818aaa95291fe6c1e525bb0571f Gerrit-Change-Number: 20094 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Comment-Date: Fri, 11 Sep 2020 20:48:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:48:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 20:48:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: Set & validate IP addresses and ports In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20065 to look at the new patch set (#2). Change subject: sip: Set & validate IP addresses and ports ...................................................................... sip: Set & validate IP addresses and ports Change-Id: Ie382f31b8b414daf598220c2e1b325b821129a40 --- M sip/SIP_Tests.ttcn 1 file changed, 98 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/20065/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie382f31b8b414daf598220c2e1b325b821129a40 Gerrit-Change-Number: 20065 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:52:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 20:52:29 +0000 Subject: Change in osmo-trx[master]: vty: add multi-ARFCN specific warning for chan N > 0 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20077 ) Change subject: vty: add multi-ARFCN specific warning for chan N > 0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I12d7c466a9a428a384233c4377627e262f165401 Gerrit-Change-Number: 20077 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 20:52:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:52:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 20:52:41 +0000 Subject: Change in osmo-trx[master]: proto_trxd: cosmetic: 'if' is not a function, add space In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20075 ) Change subject: proto_trxd: cosmetic: 'if' is not a function, add space ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I99cf10662232b1f6845d4019dd3b9be45a82d85b Gerrit-Change-Number: 20075 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 20:52:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 20:55:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 20:55:41 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20076 ) Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/20076/1/Transceiver52M/device/common/radioDevice.h File Transceiver52M/device/common/radioDevice.h: https://gerrit.osmocom.org/c/osmo-trx/+/20076/1/Transceiver52M/device/common/radioDevice.h at 189 PS1, Line 189: for (i = 0; i < tx_paths_len; i++) { What about simply iterating over "chans"? that's already set to 1 in multiarfcn mode during consturctor of RadioDevice. for (i = 0; i < chans; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 20:55:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:00:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 21:00:17 +0000 Subject: Change in libosmocore[master]: vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20079 ) Change subject: vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I49549439d5bbfbb83954ba92957304b03062d003 Gerrit-Change-Number: 20079 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 21:00:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:03:24 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Fri, 11 Sep 2020 21:03:24 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options In-Reply-To: References: Message-ID: matt9j has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 ) Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... Patch Set 1: (2 comments) > Patch Set 1: Code-Review+1 > > (2 comments) Thank you for the review! https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl File src/ipa_proto.erl: https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl at 97 PS1, Line 97: set_ccm_options > This looks like a public API, so we don't you -export() it? The module already does an export_all. I did not add an export for this function since others were not explicitly exported either. You are correct that it is intended as public API though. https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl at 257 PS1, Line 257: Result > Cosmetic: you could embed ipa_proto:request() call here: [?] Ack: I will push a new change with this incorporated. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Fri, 11 Sep 2020 21:03:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:04:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 21:04:16 +0000 Subject: Change in osmo-mgw[master]: mgcp_network: fix coverity false positive In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20092 ) Change subject: mgcp_network: fix coverity false positive ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I14f22d161c242ae518009679b584f983e0b63ca0 Gerrit-Change-Number: 20092 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 21:04:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:04:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 21:04:45 +0000 Subject: Change in osmo-trx[master]: Added PCIeSDR support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19548 ) Change subject: Added PCIeSDR support ...................................................................... Patch Set 1: Code-Review-2 As further discussion on the openbsc at lists.osmocom.org mailing list has revealed, this PCIeSDR backend in osmo-trx would link to a binary-only/proprietary library (libsdr.so). As osmo-trx is AGPLv3, there is a strong copyleft and the result would be a license violation (at least once the AGPLv3 conditions kick in due to remote interaction with the BTS or distribution of the resulting binary). We therefore have to reject merging this driver. The only two options for thi sto move ahead would be a) to write a permissive-licensed progrma (e.g. LGPL or MIT) which speaks the IPC protocol of osmo-trx-ipc, or b) to come up with an AGPLv3-compatible licensed, open source alternative to libsdr.so of Amarisoft. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I5b49b61d1c8f357e33acc066f44d6c7acfc3ba79 Gerrit-Change-Number: 19548 Gerrit-PatchSet: 1 Gerrit-Owner: Xavier Zu Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 21:04:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:05:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 11 Sep 2020 21:05:04 +0000 Subject: Change in osmo-trx[master]: Added PCIeSDR support In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19548 ) Change subject: Added PCIeSDR support ...................................................................... Abandoned abandoned due to incompatible license of libsdr.so and osmo-trx -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I5b49b61d1c8f357e33acc066f44d6c7acfc3ba79 Gerrit-Change-Number: 19548 Gerrit-PatchSet: 1 Gerrit-Owner: Xavier Zu Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:05:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 21:05:32 +0000 Subject: Change in osmo-mgw[master]: mgcp_network: fix coverity false positive In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20092 ) Change subject: mgcp_network: fix coverity false positive ...................................................................... Patch Set 1: This patch is totally wrong. Current code is fine IMHO. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I14f22d161c242ae518009679b584f983e0b63ca0 Gerrit-Change-Number: 20092 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 21:05:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:07:40 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Fri, 11 Sep 2020 21:07:40 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 to look at the new patch set (#2). Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... ipa_proto: Implement ccm response with variable options This commit allows configuration of the ccm protocol options used when setting up an ipa connection with an external entity. The options record is kept alongside the socket in the socket-owning process loop, and used to fill the values in the ccm identity response. If additional CCM state were needed in the future this commit could be extended to keep generic state, with the options only representing one piece of the overall state. Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a --- A include/ipa.hrl M src/ipa_proto.erl 2 files changed, 83 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/18/20018/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 2 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:08:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 21:08:20 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20093 ) Change subject: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/20093/1/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/c/osmo-msc/+/20093/1/src/libmsc/gsm_04_08.c at 831 PS1, Line 831: return -EINVAL; return rc? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37981205870b094b3a40a20197461208daa62698 Gerrit-Change-Number: 20093 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 21:08:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:09:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 11 Sep 2020 21:09:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set verdict to pass when TC_emerg_premption is done In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20086 ) Change subject: BSC_Tests: set verdict to pass when TC_emerg_premption is done ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie612b32cfa9cedd1e0f1d51e48911da94ec325cf Gerrit-Change-Number: 20086 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 21:09:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 21:22:47 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 21:22:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: add IPv6 support for SNS In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 ) Change subject: PCU: add IPv6 support for SNS ...................................................................... Patch Set 2: Code-Review-2 the SGSN tests should be merged first! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I43d64caca600fff78f3fbbb3e8179f447f235d46 Gerrit-Change-Number: 20003 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 11 Sep 2020 21:22:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 11 22:23:27 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 22:23:27 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5f5bf8e74725b_1c8f2b0c998c45f84790bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_10/aarch64 Package network:osmocom:nightly/ulfius failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-9:39) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 22:23:27 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 22:23:27 +0000 Subject: Build failure of network:osmocom:latest/ulfius in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <5f5bf8e957009_1c8f2b0c998c45f84791d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/openSUSE_Factory_ARM/aarch64 Package network:osmocom:latest/ulfius failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-8:14) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 22:24:18 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 22:24:18 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <5f5bf92527db8_1c8f2b0c998c45f847936b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/ulfius failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-4:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 23:46:52 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 23:46:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5c0c7d620f1_1c8f2b0c998c45f85140cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 739s] [612/642] installing dbus-user-session-1.12.20-1 [ 739s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 740s] Processing triggers for libc-bin (2.31-3) ... [ 740s] [614/642] installing texlive-xetex-2020.20200804-2 [ 742s] Processing triggers for tex-common (6.15) ... [ 742s] Running mktexlsr. This may take some time... done. [ 742s] Building format(s) --all. [ 778s] This may take some time... done. [ 778s] Processing triggers for man-db (2.9.3-2) ... [ 780s] [615/642] installing dblatex-0.3.11py3-1 [ 781s] Processing triggers for man-db (2.9.3-2) ... [ 783s] Processing triggers for tex-common (6.15) ... [ 783s] Running mktexlsr. This may take some time... done. [ 783s] Processing triggers for sgml-base (1.30) ... [ 783s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 785s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 785s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 785s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 785s] Processing triggers for man-db (2.9.3-2) ... [ 787s] Errors were encountered while processing: [ 787s] libopenmpi-dev:amd64 [ 787s] exit ... [ 787s] ### VM INTERACTION START ### [ 788s] Powering off. [ 788s] [ 765.376828] reboot: Power down [ 788s] ### VM INTERACTION END ### [ 788s] [ 788s] lamb08 failed "build osmo-trx_1.2.0.dsc" at Fri Sep 11 23:46:33 UTC 2020. [ 788s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 11 23:47:26 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 Sep 2020 23:47:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5c0c99f23c9_1c8f2b0c998c45f85143d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 275s] [612/642] installing dbus-user-session-1.12.20-1 [ 276s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 276s] Processing triggers for libc-bin (2.31-3) ... [ 276s] [614/642] installing texlive-xetex-2020.20200804-2 [ 277s] Processing triggers for tex-common (6.15) ... [ 277s] Running mktexlsr. This may take some time... done. [ 277s] Building format(s) --all. [ 297s] This may take some time... done. [ 297s] Processing triggers for man-db (2.9.3-2) ... [ 297s] [615/642] installing dblatex-0.3.11py3-1 [ 297s] Processing triggers for man-db (2.9.3-2) ... [ 298s] Processing triggers for tex-common (6.15) ... [ 298s] Running mktexlsr. This may take some time... done. [ 298s] Processing triggers for sgml-base (1.30) ... [ 298s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 298s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 298s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 298s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 298s] Processing triggers for man-db (2.9.3-2) ... [ 299s] Errors were encountered while processing: [ 299s] libopenmpi-dev:amd64 [ 299s] exit ... [ 299s] ### VM INTERACTION START ### [ 300s] Powering off. [ 300s] [ 285.225545] reboot: Power down [ 300s] ### VM INTERACTION END ### [ 300s] [ 300s] sheep88 failed "build osmo-trx_1.2.0.81.1f37.dsc" at Fri Sep 11 23:47:11 UTC 2020. [ 300s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Sep 11 23:54:01 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 23:54:01 +0000 Subject: Change in osmo-msc[master]: Introduce RNC paging attempts and timeout In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15494 ) Change subject: Introduce RNC paging attempts and timeout ...................................................................... Patch Set 10: (3 comments) The commit now only changes the RNC paging https://gerrit.osmocom.org/c/osmo-msc/+/15494/1/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-msc/+/15494/1/include/osmocom/msc/gsm_data.h at 127 PS1, Line 127: #define MSC_PAGING_ATTEMPTS 3 > MSC_PAGING_ATTEMPTS_DEFAULT Done https://gerrit.osmocom.org/c/osmo-msc/+/15494/1/include/osmocom/msc/gsm_data.h at 176 PS1, Line 176: unsigned int paging_attempts; > max_paging_attempts Done https://gerrit.osmocom.org/c/osmo-msc/+/15494/1/include/osmocom/msc/paging.h File include/osmocom/msc/paging.h: https://gerrit.osmocom.org/c/osmo-msc/+/15494/1/include/osmocom/msc/paging.h at 38 PS1, Line 38: int > In struct 'gsm_network' you're using unsigned int. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 Gerrit-Change-Number: 15494 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: efistokl Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Sep 2020 23:54:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 11 23:55:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 11 Sep 2020 23:55:11 +0000 Subject: Change in osmo-msc[master]: paging: reduce paging response timer to 3 sec In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15527 ) Change subject: paging: reduce paging response timer to 3 sec ...................................................................... Abandoned The RNC timeout is controlled by a different vty. Chaging the default paging response for 2G seems to be wrong -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie695aa67458753794d70ed5154df51bfe6696da3 Gerrit-Change-Number: 15527 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 00:17:13 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 00:17:13 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation In-Reply-To: References: Message-ID: Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19417 to look at the new patch set (#30). Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Reimplement NS with FSM. Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gsm/prim.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_frgre.c A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_message.c A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_udp.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M src/logging.c M tests/logging/logging_vty_test.vty 17 files changed, 6,165 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/30 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 30 Gerrit-Owner: lynxis lazus Gerrit-Assignee: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 00:42:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 00:42:56 +0000 Subject: Change in osmo-msc[master]: Introduce RNC paging attempts and timeout In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, efistokl, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 to look at the new patch set (#11). Change subject: Introduce RNC paging attempts and timeout ...................................................................... Introduce RNC paging attempts and timeout The 3G / RNC paging is different from 2G / BSC paging. On 3G / RNC the MSC is responsible to resent the paging while on 2G the BSC is responsible for this. For this reason introduce different paging timeout and attempts. 2G: paging timeout = (msc paging response-timer) 3G: paging timeout = (msc rnc paging response-timer) * (msc rnc paging attempts) Some MS/UE might not be reachable on the first attempt. E.g. when the MS/UE is moving between channels it might not respond to paging. Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/paging.c M tests/test_nodes.vty 6 files changed, 70 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/94/15494/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 Gerrit-Change-Number: 15494 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: efistokl Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 00:51:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 00:51:10 +0000 Subject: Change in libosmocore[master]: libgb/ns: allow to create NS_ALIVE NSVC References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20097 ) Change subject: libgb/ns: allow to create NS_ALIVE NSVC ...................................................................... libgb/ns: allow to create NS_ALIVE NSVC Change-Id: I562c3ac4a8baaa2c97852bbd6a5a10ba1f144004 --- M src/gb/gprs_ns2.c 1 file changed, 27 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/20097/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index bae9438..0fa7197 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -625,15 +625,28 @@ return GPRS_NS2_CS_SKIPPED; } - /* Only the RESET procedure creates a new NSVC */ - if (nsh->pdu_type != NS_PDUT_RESET) { - rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE); + if (bind->vc_mode == NS2_VC_MODE_BLOCKRESET) { + /* Only the RESET procedure creates a new NSVC */ + if (nsh->pdu_type != NS_PDUT_RESET) { + rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE); - if (rc < 0) { - LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc); - return rc; + if (rc < 0) { + LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc); + return rc; + } + return GPRS_NS2_CS_REJECTED; } - return GPRS_NS2_CS_REJECTED; + } else { /* NS2_VC_MODE_ALIVE */ + /* Only the ALIVE procedure creates a new NSVC */ + if (nsh->pdu_type != NS_PDUT_ALIVE) { + rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE); + + if (rc < 0) { + LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc); + return rc; + } + return GPRS_NS2_CS_REJECTED; + } } rc = ns2_tlv_parse(&tp, nsh->data, @@ -645,11 +658,13 @@ return GPRS_NS2_CS_REJECTED; } - if (!TLVP_PRESENT(&tp, NS_IE_CAUSE) || - !TLVP_PRESENT(&tp, NS_IE_VCI) || !TLVP_PRESENT(&tp, NS_IE_NSEI)) { - LOGP(DLNS, LOGL_ERROR, "NS RESET Missing mandatory IE\n"); - rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_MISSING_ESSENT_IE); - return GPRS_NS2_CS_REJECTED; + if (bind->vc_mode == NS2_VC_MODE_BLOCKRESET) { + if (!TLVP_PRESENT(&tp, NS_IE_CAUSE) || + !TLVP_PRESENT(&tp, NS_IE_VCI) || !TLVP_PRESENT(&tp, NS_IE_NSEI)) { + LOGP(DLNS, LOGL_ERROR, "NS RESET Missing mandatory IE\n"); + rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_MISSING_ESSENT_IE); + return GPRS_NS2_CS_REJECTED; + } } /* find or create NSE */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I562c3ac4a8baaa2c97852bbd6a5a10ba1f144004 Gerrit-Change-Number: 20097 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Sep 12 01:43:26 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Sep 2020 01:43:26 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f5c27c9a345f_1c8f2b0c998c45f854253a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 175s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 175s] [COMPILING libboard/qmod/source/card_pres.c] [ 175s] [COMPILING libboard/qmod/source/wwan_led.c] [ 175s] [COMPILING libboard/qmod/source/i2c.c] [ 175s] [COMPILING libboard/qmod/source/board_qmod.c] [ 175s] [COMPILING apps/dfu/main.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 176s] Memory region Used Size Region Size %age Used [ 176s] rom: 16588 B 16 KB 101.25% [ 176s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 176s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 176s] collect2: error: ld returned 1 exit status [ 176s] % [ 176s] make[2]: *** [Makefile:234: flash] Error 1 [ 176s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 176s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 176s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 176s] dh_auto_build: error: make -j1 returned exit code 2 [ 176s] make: *** [debian/rules:16: build] Error 25 [ 176s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 176s] ### VM INTERACTION START ### [ 179s] [ 169.911753] sysrq: Power Off [ 179s] [ 169.916689] reboot: Power down [ 179s] ### VM INTERACTION END ### [ 179s] [ 179s] lamb05 failed "build simtrace2_0.7.0.63.39070.dsc" at Sat Sep 12 01:43:24 UTC 2020. [ 179s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 12 02:06:18 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Sep 2020 02:06:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5c2d288f37f_1c8f2b0c998c45f85480e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 494s] [612/642] installing dbus-user-session-1.12.20-1 [ 494s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 494s] Processing triggers for libc-bin (2.31-3) ... [ 495s] [614/642] installing texlive-xetex-2020.20200804-2 [ 496s] Processing triggers for tex-common (6.15) ... [ 496s] Running mktexlsr. This may take some time... done. [ 496s] Building format(s) --all. [ 527s] This may take some time... done. [ 527s] Processing triggers for man-db (2.9.3-2) ... [ 528s] [615/642] installing dblatex-0.3.11py3-1 [ 529s] Processing triggers for man-db (2.9.3-2) ... [ 530s] Processing triggers for tex-common (6.15) ... [ 530s] Running mktexlsr. This may take some time... done. [ 530s] Processing triggers for sgml-base (1.30) ... [ 530s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 531s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 531s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 531s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 531s] Processing triggers for man-db (2.9.3-2) ... [ 532s] Errors were encountered while processing: [ 532s] libopenmpi-dev:amd64 [ 532s] exit ... [ 532s] ### VM INTERACTION START ### [ 534s] Powering off. [ 534s] [ 513.798581] reboot: Power down [ 534s] ### VM INTERACTION END ### [ 534s] [ 534s] lamb02 failed "build osmo-trx_1.2.0.83.fd88.dsc" at Sat Sep 12 02:06:08 UTC 2020. [ 534s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Sep 12 03:09:26 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Sep 2020 03:09:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5c3bf02b4e3_1c8f2b0c998c45f85677aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 265s] [612/642] installing dbus-user-session-1.12.20-1 [ 265s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 265s] Processing triggers for libc-bin (2.31-3) ... [ 265s] [614/642] installing texlive-xetex-2020.20200804-2 [ 266s] Processing triggers for tex-common (6.15) ... [ 267s] Running mktexlsr. This may take some time... done. [ 267s] Building format(s) --all. [ 286s] This may take some time... done. [ 286s] Processing triggers for man-db (2.9.3-2) ... [ 286s] [615/642] installing dblatex-0.3.11py3-1 [ 286s] Processing triggers for man-db (2.9.3-2) ... [ 287s] Processing triggers for tex-common (6.15) ... [ 287s] Running mktexlsr. This may take some time... done. [ 287s] Processing triggers for sgml-base (1.30) ... [ 287s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 287s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 287s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 287s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 287s] Processing triggers for man-db (2.9.3-2) ... [ 288s] Errors were encountered while processing: [ 288s] libopenmpi-dev:amd64 [ 288s] exit ... [ 288s] ### VM INTERACTION START ### [ 289s] Powering off. [ 289s] [ 275.379696] reboot: Power down [ 289s] ### VM INTERACTION END ### [ 289s] [ 289s] sheep86 failed "build osmo-trx_1.2.0.83.fd88.dsc" at Sat Sep 12 03:09:11 UTC 2020. [ 289s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Sep 12 07:03:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 07:03:37 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 ) Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... Patch Set 2: Code-Review+1 (1 comment) > Thank you for the review! Thanks for your contributions ;) https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl File src/ipa_proto.erl: https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018/1/src/ipa_proto.erl at 97 PS1, Line 97: set_ccm_options Oh, you're right, I didn't notice that 'export_all'. It looks like a debugging leftover, and should be removed / commented out some day. So I would still expose this API explicitly. > ... others were not explicitly exported either. Actually, register_stream() ... controlling_process() are exposed. I am not going to block your work though, this can be merged as-is. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 2 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Sat, 12 Sep 2020 07:03:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Comment-In-Reply-To: matt9j Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 07:10:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 07:10:21 +0000 Subject: Change in libosmocore[master]: vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20079 ) Change subject: vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() ...................................................................... vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() Change-Id: I49549439d5bbfbb83954ba92957304b03062d003 Fixes: CID#212137 --- M src/vty/cpu_sched_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index f608738..35671a9 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -175,7 +175,7 @@ if (CPU_ISSET_S(cpu + 3, cpuset_size, cpuset)) val |= 0x08; - if (val >= 0 && val < 10) + if (val < 10) *ptr = '0' + val; else *ptr = ('a' - 10) + val; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I49549439d5bbfbb83954ba92957304b03062d003 Gerrit-Change-Number: 20079 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Sep 12 07:25:01 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 Sep 2020 07:25:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f5c77d2dd9f0_1c8f2b0c998c45f861846c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 347s] [612/642] installing dbus-user-session-1.12.20-1 [ 347s] [613/642] installing libboost-graph-parallel1.71.0-1.71.0-6+b2 [ 348s] Processing triggers for libc-bin (2.31-3) ... [ 348s] [614/642] installing texlive-xetex-2020.20200804-2 [ 349s] Processing triggers for tex-common (6.15) ... [ 349s] Running mktexlsr. This may take some time... done. [ 349s] Building format(s) --all. [ 373s] This may take some time... done. [ 373s] Processing triggers for man-db (2.9.3-2) ... [ 374s] [615/642] installing dblatex-0.3.11py3-1 [ 374s] Processing triggers for man-db (2.9.3-2) ... [ 375s] Processing triggers for tex-common (6.15) ... [ 375s] Running mktexlsr. This may take some time... done. [ 375s] Processing triggers for sgml-base (1.30) ... [ 375s] [616/642] installing libopenmpi-dev-4.0.5-2 [ 376s] update-alternatives: error: alternative path /usr/lib/$[DEB_HOST_MULTIARCH}/openmpi/include doesn't exist [ 376s] dpkg: error processing package libopenmpi-dev:amd64 (--install): [ 376s] installed libopenmpi-dev:amd64 package post-installation script subprocess returned error exit status 2 [ 376s] Processing triggers for man-db (2.9.3-2) ... [ 376s] Errors were encountered while processing: [ 376s] libopenmpi-dev:amd64 [ 376s] exit ... [ 376s] ### VM INTERACTION START ### [ 378s] Powering off. [ 378s] [ 360.712259] reboot: Power down [ 378s] ### VM INTERACTION END ### [ 378s] [ 378s] lamb18 failed "build osmo-trx_1.2.0.dsc" at Sat Sep 12 07:24:59 UTC 2020. [ 378s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Sep 12 07:42:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 07:42:52 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 to look at the new patch set (#2). Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In the multi-ARFCN mode, if the Tx/Rx antenna names are explicitly set in 'chan N' sections of the configuration file: trx ... multi-arfcn disable chan 0 tx-path TX/RX rx-path RX2 chan 1 tx-path TX/RX rx-path RX2 chan 2 tx-path TX/RX rx-path RX2 osmo-trx would crash, because radioDevice::set_antennas() would attempt to configure antenna names for all N physical channels, while USRP devices usually have 2 or even 1 available. The easiest approach is to remove both 'tx-path'/'rx-path' from all 'chan N' sections excluding 'chan 0', so it would work fine. This makes sense, because in the multi-ARFCN mode we actually use only one physical channel. However, let's still make sure that explicit configuration of the Tx/Rx antenna names would not crash osmo-trx and skip N > 0 in radioDevice::set_antennas(). Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Related: OS#4636 --- M Transceiver52M/device/common/radioDevice.h 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/76/20076/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 07:46:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 07:46:17 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20076 ) Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/20076/1/Transceiver52M/device/common/radioDevice.h File Transceiver52M/device/common/radioDevice.h: https://gerrit.osmocom.org/c/osmo-trx/+/20076/1/Transceiver52M/device/common/radioDevice.h at 189 PS1, Line 189: for (i = 0; i < tx_paths_len; i++) { > What about simply iterating over "chans"? that's already set to 1 in multiarfcn mode during consturc [?] Thanks, Pau! I decided to make this function a bit more verbose, so we don't just skip the config entries, but print warnings. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 12 Sep 2020 07:46:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 07:47:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 07:47:34 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 to look at the new patch set (#3). Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In the multi-ARFCN mode, if the Tx/Rx antenna names are explicitly set in 'chan N' sections of the configuration file: trx ... multi-arfcn disable chan 0 tx-path TX/RX rx-path RX2 chan 1 tx-path TX/RX rx-path RX2 chan 2 tx-path TX/RX rx-path RX2 osmo-trx would crash, because radioDevice::set_antennas() would attempt to configure antenna names for all N physical channels, while USRP devices usually have 2 or even 1 available. The easiest approach is to remove both 'tx-path'/'rx-path' from all 'chan N' sections excluding 'chan 0', so it would work fine. This makes sense, because in the multi-ARFCN mode we actually use only one physical channel. However, let's still make sure that explicit configuration of the Tx/Rx antenna names would not crash osmo-trx and skip N > 0 in radioDevice::set_antennas(). Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Related: OS#4636 --- M Transceiver52M/device/common/radioDevice.h 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/76/20076/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 07:50:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 07:50:18 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20093 ) Change subject: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/20093/1/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/c/osmo-msc/+/20093/1/src/libmsc/gsm_04_08.c at 830 PS1, Line 830: ESTABLISHMENT RE-ESTABLISH https://gerrit.osmocom.org/c/osmo-msc/+/20093/1/src/libmsc/gsm_04_08.c at 831 PS1, Line 831: return -EINVAL; > return rc? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37981205870b094b3a40a20197461208daa62698 Gerrit-Change-Number: 20093 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 12 Sep 2020 07:50:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 08:12:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 08:12:36 +0000 Subject: Change in osmo-msc[master]: Introduce RNC paging attempts and timeout In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15494 ) Change subject: Introduce RNC paging attempts and timeout ...................................................................... Patch Set 11: Code-Review-1 (4 comments) https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c at 566 PS11, Line 566: rnc In the commit message you state that RNC is not responsible for paging, and it's the task of the MSC itself, so why do we have this prefix here? I find this a bit confusing, because it looks like a parameter that we somehow indicate to the RNC. Let's better use RAN type here as a prefix - 'utran' or '3g'. https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c at 575 PS11, Line 575: { cosmetic: drop curly braces https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c at 582 PS11, Line 582: response-timer I believe we should move to generic timer configuration commands, and we already have them in the 'msc' section: timer [(vlr|mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] this one would go to 'utran'. We just need to assign a new TNNNN. I know that we already have 'paging response-timer' for GERAN as a separate command, but it does not mean that we should populate the timer commands zoo with even more different entries. Ideally we need to deprecate this command and move it to 'geran' (see above). The new TNNNN should be the same for both GERAN and UTRAN. https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/paging.c File src/libmsc/paging.c: https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/paging.c at 63 PS11, Line 63: LOGL_ERROR Is it really an ERROR? Maybe rather NOTICE or even INFO? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 Gerrit-Change-Number: 15494 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: efistokl Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 12 Sep 2020 08:12:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 10:29:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 10:29:17 +0000 Subject: Change in osmo-trx[master]: proto_trxd: cosmetic: 'if' is not a function, add space In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20075 ) Change subject: proto_trxd: cosmetic: 'if' is not a function, add space ...................................................................... proto_trxd: cosmetic: 'if' is not a function, add space Change-Id: I99cf10662232b1f6845d4019dd3b9be45a82d85b --- M Transceiver52M/proto_trxd.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/Transceiver52M/proto_trxd.c b/Transceiver52M/proto_trxd.c index fbc0b14..e5a889d 100644 --- a/Transceiver52M/proto_trxd.c +++ b/Transceiver52M/proto_trxd.c @@ -69,7 +69,7 @@ int rc; /* v0 doesn't support idle frames, they are simply dropped, not sent */ - if(bi->idle) + if (bi->idle) return true; /* +2: Historically (OpenBTS times), two extra non-used bytes are sent appended to each burst */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I99cf10662232b1f6845d4019dd3b9be45a82d85b Gerrit-Change-Number: 20075 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 10:29:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 10:29:19 +0000 Subject: Change in osmo-trx[master]: vty: add multi-ARFCN specific warning for chan N > 0 In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20077 ) Change subject: vty: add multi-ARFCN specific warning for chan N > 0 ...................................................................... vty: add multi-ARFCN specific warning for chan N > 0 Change-Id: I12d7c466a9a428a384233c4377627e262f165401 Related: OS#4636 --- M CommonLibs/trx_vty.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 1cf4f5a..3fcf888 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -520,6 +520,12 @@ { struct trx_chan *chan = vty->index; + if (chan->trx->cfg.multi_arfcn && chan->idx > 0) { + vty_out(vty, "%% Setting 'rx-path' for chan %u in multi-ARFCN mode " + "does not make sense, because only chan 0 is used%s", + chan->idx, VTY_NEWLINE); + } + osmo_talloc_replace_string(chan->trx, &chan->rx_path, argv[0]); return CMD_SUCCESS; @@ -532,6 +538,12 @@ { struct trx_chan *chan = vty->index; + if (chan->trx->cfg.multi_arfcn && chan->idx > 0) { + vty_out(vty, "%% Setting 'tx-path' for chan %u in multi-ARFCN mode " + "does not make sense, because only chan 0 is used%s", + chan->idx, VTY_NEWLINE); + } + osmo_talloc_replace_string(chan->trx, &chan->tx_path, argv[0]); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I12d7c466a9a428a384233c4377627e262f165401 Gerrit-Change-Number: 20077 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 13:45:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 13:45:09 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/fh: do not configure CBCH slots statically References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20098 ) Change subject: ttcn3-bts-test/fh: do not configure CBCH slots statically ...................................................................... ttcn3-bts-test/fh: do not configure CBCH slots statically In BTS_Tests_SMSCB, we dynamically configure the CBCH slots via the VTY interface, so there is no need to set them here. This was also the reason of some SMSCB test case failures, because the BSC would send unexpected LOAD INDICATIONs. Change-Id: I6e005ca772e26878c7b19df0d854936d7b7718dd Related: SYS#4868, OS#4708 --- M ttcn3-bts-test/fh/BTS_Tests.cfg M ttcn3-bts-test/fh/osmo-bsc.cfg 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/98/20098/1 diff --git a/ttcn3-bts-test/fh/BTS_Tests.cfg b/ttcn3-bts-test/fh/BTS_Tests.cfg index b6cd28a..32ff27d 100644 --- a/ttcn3-bts-test/fh/BTS_Tests.cfg +++ b/ttcn3-bts-test/fh/BTS_Tests.cfg @@ -22,7 +22,7 @@ * +-------+------------------+------------------+------------------+------------------+ * | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | * +-------+------------------+------------------+------------------+------------------+ - * | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH (b) | SDCCH8+CBCH (b) | + * | TS1 | TCH/F | SDCCH8 | SDCCH8 (b) | SDCCH8 (b) | * +-------+------------------+------------------+------------------+------------------+ * | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | * +-------+------------------+------------------+------------------+------------------+ @@ -51,7 +51,7 @@ } }, { /* TS1 */ - { /* Group b) SDCCH8+CBCH */ + { /* Group b) SDCCH8 */ hsn := 1, trx_maio := { { trx_nr := 2, maio := 3 }, diff --git a/ttcn3-bts-test/fh/osmo-bsc.cfg b/ttcn3-bts-test/fh/osmo-bsc.cfg index e11cec4..d41393b 100644 --- a/ttcn3-bts-test/fh/osmo-bsc.cfg +++ b/ttcn3-bts-test/fh/osmo-bsc.cfg @@ -189,7 +189,7 @@ hopping arfcn add 875 hopping arfcn add 877 timeslot 1 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 ! Intentionally non-hopping hopping enabled 0 timeslot 2 @@ -256,7 +256,7 @@ hopping arfcn add 875 hopping arfcn add 877 timeslot 1 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 ! (b) HSN=1, MAIO=3,5 hopping enabled 1 hopping sequence-number 1 @@ -327,7 +327,7 @@ hopping arfcn add 875 hopping arfcn add 877 timeslot 1 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 ! (b) HSN=1, MAIO=3,5 hopping enabled 1 hopping sequence-number 1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e005ca772e26878c7b19df0d854936d7b7718dd Gerrit-Change-Number: 20098 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 13:46:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 13:46:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: also match MA length in TC_pcu_info_ind_fh_params() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20099 ) Change subject: BTS_Tests: also match MA length in TC_pcu_info_ind_fh_params() ...................................................................... BTS_Tests: also match MA length in TC_pcu_info_ind_fh_params() Change-Id: Ibebbedecaed0a3f24a1bc7b520013fa563c4bbda --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/20099/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 6412022..58b2213 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5419,7 +5419,8 @@ tr_ts := tr_PCUIF_InfoTrxTsH1( hsn := pars.maio_hsn.hsn, maio := pars.maio_hsn.maio, - ma := f_pad_bit(pars.ma_map.ma, 64, '0'B)); + ma := f_pad_bit(pars.ma_map.ma, 64, '0'B), + ma_bit_len := lengthof(pars.ma_map.ma)); } else { tr_ts := tr_PCUIF_InfoTrxTsH0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibebbedecaed0a3f24a1bc7b520013fa563c4bbda Gerrit-Change-Number: 20099 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 13:46:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 13:46:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: simplify MA length calculation in f_resolve_fh_params() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20100 ) Change subject: BTS_Tests: simplify MA length calculation in f_resolve_fh_params() ...................................................................... BTS_Tests: simplify MA length calculation in f_resolve_fh_params() Change-Id: I13f1d45162b520eff0d2e9823604fda85b71970b Related: SYS#4868, OS#4708 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/20100/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 58b2213..ac781f6 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -547,9 +547,7 @@ if (ispresent(pars.maio_hsn)) { /* Prepare the Mobile Allocation bitmask (length & padding) */ - pars.ma_map.len := mp_transceiver_num / 8; - if (mp_transceiver_num mod 8 > 0) - { pars.ma_map.len := pars.ma_map.len + 1; } + pars.ma_map.len := (mp_transceiver_num + 8 - 1) / 8; /* in bytes */ pars.ma_map.ma := f_pad_bit('0'B, pars.ma_map.len * 8, '0'B); /* Compose the actual Mobile Allocation and the bitmask */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13f1d45162b520eff0d2e9823604fda85b71970b Gerrit-Change-Number: 20100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 13:46:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 13:46:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: group hopping parameters into a separate record References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20101 ) Change subject: BTS_Tests: group hopping parameters into a separate record ...................................................................... BTS_Tests: group hopping parameters into a separate record Change-Id: Iedb5d858a2d4f5d5a45e7465ae6586b3ae4bbb72 Related: SYS#4868, OS#4708 --- M bts/BTS_Tests.ttcn M bts/BTS_Tests_LAPDm.ttcn M library/LAPDm_RAW_PT.ttcn 3 files changed, 62 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/20101/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index ac781f6..3100d03 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -237,6 +237,17 @@ } } +friend type record FreqHopPars { + /* Whether frequency hopping is in use */ + boolean enabled, + /* Mobile Allocation Index Offset / Hopping Sequence Number */ + MaioHsn maio_hsn, + /* MA bitmap to be indicated in RR Immediate Assignment */ + MobileAllocationLV ma_map, + /* The actual Mobile Allocation (ARFCN list) to be used */ + L1ctlMA ma +}; + type record ConnHdlrPars { RslChannelNr chan_nr, RSL_IE_ChannelMode chan_mode, @@ -246,13 +257,9 @@ RSL_IE_EncryptionInfo encr optional, BtsBand bts0_band optional, - /* Frequency hopping parameters (disabled if absent) */ - MaioHsn maio_hsn optional, - /* MA bitmap to be indicated in RR Immediate Assignment */ - MobileAllocationLV ma_map, - /* The actual Mobile Allocation (ARFCN list) to be used */ - L1ctlMA ma -} + /* Frequency hopping parameters */ + FreqHopPars fhp +}; /* Test-specific parameters */ private type union TestSpecUnion { @@ -529,36 +536,40 @@ uint6_t maio }; -friend function f_resolve_fh_params(inout ConnHdlrPars pars, uint8_t trx_nr := 0) +friend function f_resolve_fh_params(inout FreqHopPars fhp, uint8_t tn, + uint8_t trx_nr := 0) { - var FreqHopGroups groups := mp_fh_config[pars.chan_nr.tn]; + var FreqHopGroups groups := mp_fh_config[tn]; var integer i, j; + fhp.enabled := false; + for (i := 0; i < lengthof(groups); i := i + 1) { var FreqHopGroup g := groups[i]; for (j := 0; j < lengthof(g.trx_maio); j := j + 1) { var FreqHopGroupItem gi := g.trx_maio[j]; if (gi.trx_nr == trx_nr) { - pars.maio_hsn := valueof(ts_HsnMaio(g.hsn, gi.maio)); - pars.ma := { }; /* to be composed below */ + fhp.maio_hsn.maio := gi.maio; + fhp.maio_hsn.hsn := g.hsn; + fhp.enabled := true; break; } } - if (ispresent(pars.maio_hsn)) { + if (fhp.enabled) { /* Prepare the Mobile Allocation bitmask (length & padding) */ - pars.ma_map.len := (mp_transceiver_num + 8 - 1) / 8; /* in bytes */ - pars.ma_map.ma := f_pad_bit('0'B, pars.ma_map.len * 8, '0'B); + fhp.ma_map.len := (mp_transceiver_num + 8 - 1) / 8; /* in bytes */ + fhp.ma_map.ma := f_pad_bit('0'B, fhp.ma_map.len * 8, '0'B); + fhp.ma := { }; /* to be composed below */ /* Compose the actual Mobile Allocation and the bitmask */ for (j := 0; j < lengthof(g.trx_maio); j := j + 1) { var FreqHopGroupItem gi := g.trx_maio[j]; - pars.ma := pars.ma & { l1ctl_ma_def[gi.trx_nr] }; - pars.ma_map.ma[gi.trx_nr] := '1'B; + fhp.ma := fhp.ma & { l1ctl_ma_def[gi.trx_nr] }; + fhp.ma_map.ma[gi.trx_nr] := '1'B; } - log("Freq. hopping parameters: maio_hsn := ", pars.maio_hsn, - ", ma := ", pars.ma, ", ma_map := ", pars.ma_map); + log("Freq. hopping parameters: ", fhp); break; /* We're done */ } } @@ -591,7 +602,7 @@ /* Obtain frequency hopping parameters for a given timeslot */ if (mp_freq_hop_enabled and mp_transceiver_num > 1) { - f_resolve_fh_params(pars); + f_resolve_fh_params(pars.fhp, pars.chan_nr.tn); } vc_conn.start(f_handler_init(fn, id, pars)); @@ -700,7 +711,6 @@ friend template ConnHdlrPars t_Pars(template RslChannelNr chan_nr, template RSL_IE_ChannelMode chan_mode, - template (omit) MaioHsn maio_hsn := omit, float t_guard := 20.0) := { chan_nr := valueof(chan_nr), chan_mode := valueof(chan_mode), @@ -726,9 +736,12 @@ spec := omit, encr := omit, bts0_band := omit, - maio_hsn := maio_hsn, - ma_map := c_MA_null, - ma := l1ctl_ma_def + fhp := { + enabled := false, + maio_hsn := ts_HsnMaio(0, 0), + ma_map := c_MA_null, + ma := l1ctl_ma_def + } } /*********************************************************************** @@ -2002,16 +2015,16 @@ /* Tune to a dedicated channel: L1CTL only */ private function f_l1ctl_est_dchan(L1CTL_PT pt, ConnHdlrPars pars) { - if (not ispresent(pars.maio_hsn)) { + if (not pars.fhp.enabled) { pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, 7 /* TODO: mp_tsc */, mp_trx0_arfcn)); } else { pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, 7 /* TODO: mp_tsc */, - pars.maio_hsn.hsn, - pars.maio_hsn.maio, - pars.ma)); + pars.fhp.maio_hsn.hsn, + pars.fhp.maio_hsn.maio, + pars.fhp.ma)); } } @@ -2029,14 +2042,14 @@ f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies); /* Craft channel description (with or without frequency hopping parameters) */ - if (ispresent(g_pars.maio_hsn)) { - ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.maio_hsn)); + if (g_pars.fhp.enabled) { + ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn)); } else { ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx0_arfcn)); } /* Send IMM.ASS via CCHAN */ - var GsmRrMessage rr_msg := valueof(ts_IMM_ASS(ra, fn, 0, ch_desc, g_pars.ma_map)); + var GsmRrMessage rr_msg := valueof(ts_IMM_ASS(ra, fn, 0, ch_desc, g_pars.fhp.ma_map)); RSL.send(ts_RSL_IMM_ASSIGN(enc_GsmRrMessage(rr_msg))); /* receive IMM.ASS on MS side */ @@ -2049,7 +2062,7 @@ } /* enable dedicated mode */ - f_L1CTL_DM_EST_REQ_IA(L1CTL, ia_um, ma := g_pars.ma); + f_L1CTL_DM_EST_REQ_IA(L1CTL, ia_um, ma := g_pars.fhp.ma); /* enable encryption, if requested */ if (encr_enable) { var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); @@ -4661,7 +4674,7 @@ /* Tune trxcon to that PDCH channel */ var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); if (mp_freq_hop_enabled and mp_transceiver_num > 1) - { f_resolve_fh_params(pars); } + { f_resolve_fh_params(pars.fhp, pars.chan_nr.tn); } f_l1ctl_est_dchan(L1CTL, pars); /* Verify PTCCH/U: send several access bursts, make sure they're received */ @@ -4925,7 +4938,7 @@ /* Tune trxcon to that PDCH channel on TS7 */ var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); if (mp_freq_hop_enabled and mp_transceiver_num > 1) - { f_resolve_fh_params(pars); } + { f_resolve_fh_params(pars.fhp, pars.chan_nr.tn); } f_l1ctl_est_dchan(L1CTL, pars); /* C/I in centiBels, test range: -256 .. +1280, step 128 */ @@ -5395,7 +5408,7 @@ /* Verify hopping parameters in the INFO.ind message (version >= 10) */ testcase TC_pcu_info_ind_fh_params() runs on test_CT { var PCUIF_info_ind info_ind; - var ConnHdlrPars pars; + var FreqHopPars fhp; f_init(); @@ -5408,17 +5421,18 @@ continue; } - pars := valueof(t_Pars(t_RslChanNr_PDCH(tn), ts_RSL_ChanMode_SIGN)); if (mp_freq_hop_enabled and mp_transceiver_num > 1) - { f_resolve_fh_params(pars); } + { f_resolve_fh_params(fhp, tn); } + else + { fhp.enabled := false; } var template PCUIF_InfoTrxTs tr_ts; - if (ispresent(pars.maio_hsn)) { + if (fhp.enabled) { tr_ts := tr_PCUIF_InfoTrxTsH1( - hsn := pars.maio_hsn.hsn, - maio := pars.maio_hsn.maio, - ma := f_pad_bit(pars.ma_map.ma, 64, '0'B), - ma_bit_len := lengthof(pars.ma_map.ma)); + hsn := fhp.maio_hsn.hsn, + maio := fhp.maio_hsn.maio, + ma := f_pad_bit(fhp.ma_map.ma, 64, '0'B), + ma_bit_len := lengthof(fhp.ma_map.ma)); } else { tr_ts := tr_PCUIF_InfoTrxTsH0; } diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index 9981bbc..0e27ad1 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -54,13 +54,15 @@ /* master function switching to a dedicated radio channel */ function f_switch_dcch() runs on ConnHdlr { var BCCH_tune_req tune_req := { arfcn := { false, mp_trx0_arfcn }, combined_ccch := true }; - var DCCH_switch_req sw_req := { ma := g_pars.ma }; + var DCCH_switch_req sw_req; /* Craft channel description (with or without frequency hopping parameters) */ - if (ispresent(g_pars.maio_hsn)) { - sw_req.chan_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.maio_hsn)); + if (g_pars.fhp.enabled) { + sw_req.chan_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn)); + sw_req.ma := g_pars.fhp.ma; } else { sw_req.chan_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx0_arfcn)); + sw_req.ma := omit; } LAPDM.send(tune_req); @@ -239,7 +241,7 @@ /* Obtain frequency hopping parameters for a given timeslot */ if (mp_freq_hop_enabled and mp_transceiver_num > 1) { - f_resolve_fh_params(g_pars); + f_resolve_fh_params(g_pars.fhp, g_pars.chan_nr.tn); } /* activate the channel on the BTS side */ diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 77f0452..d0ad24b 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -39,7 +39,7 @@ /* directly switch to a dedicated channel (without RACH/IMM.ASS */ type record DCCH_switch_req { ChannelDescription chan_desc, - L1ctlMA ma + L1ctlMA ma optional } type record DCCH_switch_res { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iedb5d858a2d4f5d5a45e7465ae6586b3ae4bbb72 Gerrit-Change-Number: 20101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 13:46:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 13:46:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests_SMSCB: handle frequency hopping parameters References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20102 ) Change subject: BTS_Tests_SMSCB: handle frequency hopping parameters ...................................................................... BTS_Tests_SMSCB: handle frequency hopping parameters Change-Id: I1fd0a46b3d23afabae81fd1da5d2466e61e4a806 Related: SYS#4868, OS#4708 --- M bts/BTS_Tests_SMSCB.ttcn 1 file changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/20102/1 diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 29489fc..953801b 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -56,6 +56,8 @@ type record CbchTestPars { /* Should we execute on SDCCH4 or SDCCH8? */ RslChannelNr chan_nr, + /* Frequency Hopping parameters */ + FreqHopPars fhp, /* Parameters for BASIC CBCH */ CbchTestParsChan basic, /* Parameters for EXTENDED CBCH */ @@ -235,6 +237,12 @@ mtc.stop; } + /* Obtain frequency hopping parameters for a given timeslot */ + if (mp_freq_hop_enabled and mp_transceiver_num > 1) + { f_resolve_fh_params(pars.fhp, pars.chan_nr.tn); } + else + { pars.fhp.enabled := false; } + f_cbch_compute_exp_blocks(pars); f_init_vty_bsc(); @@ -249,10 +257,18 @@ f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH); } else { f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED); - /* TODO: also handle frequency hopping parameters */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, - 7 /* TODO: mp_tsc */, - mp_trx0_arfcn)); + + if (pars.fhp.enabled) { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, + 7 /* TODO: mp_tsc */, + pars.fhp.maio_hsn.hsn, + pars.fhp.maio_hsn.maio, + pars.fhp.ma)); + } else { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, + 7 /* TODO: mp_tsc */, + mp_trx0_arfcn)); + } } /* send SMSCB[s] via RSL */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1fd0a46b3d23afabae81fd1da5d2466e61e4a806 Gerrit-Change-Number: 20102 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 13:54:49 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 13:54:49 +0000 Subject: Change in osmo-msc[master]: Introduce RNC paging attempts and timeout In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, efistokl, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 to look at the new patch set (#12). Change subject: Introduce RNC paging attempts and timeout ...................................................................... Introduce RNC paging attempts and timeout The 3G / RNC paging is different from 2G / BSC paging. On 3G / RNC the MSC is responsible to resent the paging while on 2G the BSC is responsible for this. For this reason introduce different paging timeout and attempts. 2G: paging timeout = (msc paging response-timer) 3G: paging timeout = (msc rnc paging response-timer) * (msc rnc paging attempts) Some MS/UE might not be reachable on the first attempt. E.g. when the MS/UE is moving between channels it might not respond to paging. Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/paging.c M tests/test_nodes.vty 6 files changed, 71 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/94/15494/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 Gerrit-Change-Number: 15494 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: efistokl Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 13:57:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 13:57:11 +0000 Subject: Change in osmo-msc[master]: Introduce RNC paging attempts and timeout In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15494 ) Change subject: Introduce RNC paging attempts and timeout ...................................................................... Patch Set 12: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c at 582 PS11, Line 582: response-timer > I believe we should move to generic timer configuration commands, and we already have them in the 'm [?] There isn't an official T timer for this. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 Gerrit-Change-Number: 15494 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: efistokl Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 12 Sep 2020 13:57:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 14:02:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 12 Sep 2020 14:02:09 +0000 Subject: Change in osmo-msc[master]: Introduce RNC paging attempts and timeout In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15494 ) Change subject: Introduce RNC paging attempts and timeout ...................................................................... Patch Set 12: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/15494/11/src/libmsc/msc_vty.c at 582 PS11, Line 582: response-timer > There isn't an official T timer for this. I know, but we do have non-specified (Osmocom specific) timers like X1, X2, X3... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 Gerrit-Change-Number: 15494 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: efistokl Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 12 Sep 2020 14:02:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 14:02:12 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 14:02:12 +0000 Subject: Change in osmo-bsc[master]: vty: clarify NM state owner printed by 'show trx N' command In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20080 ) Change subject: vty: clarify NM state owner printed by 'show trx N' command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib17d1e98cfa1f293cf76cd9614722b6dec538960 Gerrit-Change-Number: 20080 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 12 Sep 2020 14:02:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:55:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:55:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: also match MA length in TC_pcu_info_ind_fh_params() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20099 ) Change subject: BTS_Tests: also match MA length in TC_pcu_info_ind_fh_params() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibebbedecaed0a3f24a1bc7b520013fa563c4bbda Gerrit-Change-Number: 20099 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 18:55:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:55:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:55:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: simplify MA length calculation in f_resolve_fh_params() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20100 ) Change subject: BTS_Tests: simplify MA length calculation in f_resolve_fh_params() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13f1d45162b520eff0d2e9823604fda85b71970b Gerrit-Change-Number: 20100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 18:55:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:56:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:56:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: group hopping parameters into a separate record In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20101 ) Change subject: BTS_Tests: group hopping parameters into a separate record ...................................................................... Patch Set 1: Code-Review+1 the "why" would be interesting in the commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iedb5d858a2d4f5d5a45e7465ae6586b3ae4bbb72 Gerrit-Change-Number: 20101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 18:56:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:56:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:56:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: group hopping parameters into a separate record In-Reply-To: References: Message-ID: laforge has removed fixeria from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20101 ) Change subject: BTS_Tests: group hopping parameters into a separate record ...................................................................... Removed reviewer fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iedb5d858a2d4f5d5a45e7465ae6586b3ae4bbb72 Gerrit-Change-Number: 20101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteReviewer -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:56:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:56:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: simplify MA length calculation in f_resolve_fh_params() In-Reply-To: References: Message-ID: laforge has removed fixeria from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20100 ) Change subject: BTS_Tests: simplify MA length calculation in f_resolve_fh_params() ...................................................................... Removed reviewer fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13f1d45162b520eff0d2e9823604fda85b71970b Gerrit-Change-Number: 20100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteReviewer -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:56:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:56:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: also match MA length in TC_pcu_info_ind_fh_params() In-Reply-To: References: Message-ID: laforge has removed fixeria from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20099 ) Change subject: BTS_Tests: also match MA length in TC_pcu_info_ind_fh_params() ...................................................................... Removed reviewer fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibebbedecaed0a3f24a1bc7b520013fa563c4bbda Gerrit-Change-Number: 20099 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteReviewer -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:57:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:57:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests_SMSCB: handle frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20102 ) Change subject: BTS_Tests_SMSCB: handle frequency hopping parameters ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1fd0a46b3d23afabae81fd1da5d2466e61e4a806 Gerrit-Change-Number: 20102 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 12 Sep 2020 18:57:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 18:59:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 18:59:41 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/fh: do not configure CBCH slots statically In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20098 ) Change subject: ttcn3-bts-test/fh: do not configure CBCH slots statically ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e005ca772e26878c7b19df0d854936d7b7718dd Gerrit-Change-Number: 20098 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 18:59:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:00:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:00:03 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop explicit config of mp_mncc_version In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20062 ) Change subject: ttcn3-sip: Drop explicit config of mp_mncc_version ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5dbacdd4bd8110b7f6cf6bdb561af420b65c035f Gerrit-Change-Number: 20062 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:00:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:01:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:01:13 +0000 Subject: Change in osmo-trx[master]: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20076 ) Change subject: radioDevice: fix set_antennas(): consider MULTI_ARFCN mode ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I09f316f181cbbc2214e8913b73f7c1fcea4e8c05 Gerrit-Change-Number: 20076 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 12 Sep 2020 19:01:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:02:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:02:45 +0000 Subject: Change in libosmocore[master]: libgb/ns: allow to create NS_ALIVE NSVC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20097 ) Change subject: libgb/ns: allow to create NS_ALIVE NSVC ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I562c3ac4a8baaa2c97852bbd6a5a10ba1f144004 Gerrit-Change-Number: 20097 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:02:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:03:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:03:07 +0000 Subject: Change in pysim[master]: cards.py: Populate AIDs present in SysmoISIMSJA2 UICC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20094 ) Change subject: cards.py: Populate AIDs present in SysmoISIMSJA2 UICC ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5f00aa9b03b41818aaa95291fe6c1e525bb0571f Gerrit-Change-Number: 20094 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:03:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:04:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:04:03 +0000 Subject: Change in pysim[master]: Use the function select_adf_by_aid for selecting an AID In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20095 ) Change subject: Use the function select_adf_by_aid for selecting an AID ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5e0e87e9cf238922d60fda7a7836e65f91f2c233 Gerrit-Change-Number: 20095 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Sat, 12 Sep 2020 19:04:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:06:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:06:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mncc: Support IPv6 addresses (new version mncc 7) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 ) Change subject: mncc: Support IPv6 addresses (new version mncc 7) ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056/1/library/MNCC_EncDec.cc File library/MNCC_EncDec.cc: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056/1/library/MNCC_EncDec.cc at 195 PS1, Line 195: memcpy(((struct sockaddr_in6*)&rtp.addr)->sin6_addr, in.u().rtp().ip().data(), > I still need to figure out how to get a memory buffer point out of an octetstring here, from ip(). I read it five times now and I still don't understand what you're trying to say, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b Gerrit-Change-Number: 20056 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 12 Sep 2020 19:06:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:08:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:08:07 +0000 Subject: Change in pysim[master]: Remove redundant function read_aid() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20096 ) Change subject: Remove redundant function read_aid() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46c4ac0b994db7fb5c3113175009175ec5c154e3 Gerrit-Change-Number: 20096 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:08:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:08:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:08:56 +0000 Subject: Change in osmo-e1d[master]: src/ctl.c: Log NOTICE messages whenever client send unexpected requests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20074 ) Change subject: src/ctl.c: Log NOTICE messages whenever client send unexpected requests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icd47de13ab84b89ce5fb21c24713bae760611d32 Gerrit-Change-Number: 20074 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 12 Sep 2020 19:08:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:09:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:09:02 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add support for osmo-e1d In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19929 ) Change subject: e1-prbs-test: Add support for osmo-e1d ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 Gerrit-Change-Number: 19929 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 12 Sep 2020 19:09:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:10:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:10:24 +0000 Subject: Change in osmo-e1d[master]: make sure a given timeslot can only be opened once (by default) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20081 ) Change subject: make sure a given timeslot can only be opened once (by default) ...................................................................... Patch Set 1: > Looks good except for the protocol version number needing a bump. I would actually prefer to add it to a TODO-RELEASE file and bump the version at the time we make a new tagged release (which is how we do in other osmo* projects). Otherwise we may end up bumping the protocol version multiple times without ever releasing anything. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 Gerrit-Change-Number: 20081 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 12 Sep 2020 19:10:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:10:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:10:29 +0000 Subject: Change in osmo-e1d[master]: src/ctl.c: Log NOTICE messages whenever client send unexpected requests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20074 ) Change subject: src/ctl.c: Log NOTICE messages whenever client send unexpected requests ...................................................................... src/ctl.c: Log NOTICE messages whenever client send unexpected requests Change-Id: Icd47de13ab84b89ce5fb21c24713bae760611d32 --- M src/ctl.c 1 file changed, 16 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/ctl.c b/src/ctl.c index fee96f8..8da21fd 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -360,16 +360,22 @@ /* Process query and find timeslot */ intf = e1d_find_intf(e1d, hdr->intf); - if (!intf) + if (!intf) { + LOGP(DE1D, LOGL_NOTICE, "Client request for non-existant Interface %u\n", hdr->intf); return 0; + } line = e1_intf_find_line(intf, hdr->line); - if (!line) + if (!line) { + LOGPIF(intf, DE1D, LOGL_NOTICE, "Client request for non-existant line %u\n", hdr->line); return 0; + } ts = _e1d_get_ts(line, hdr->ts); - if (!ts) + if (!ts) { + LOGPLI(line, DE1D, LOGL_NOTICE, "Client request for non-existant ts %u\n", hdr->ts); return 0; + } /* Select mode */ switch (cfg->mode) { @@ -380,19 +386,24 @@ mode = E1_TS_MODE_HDLCFCS; break; default: + LOGPTS(ts, DE1D, LOGL_NOTICE, "Client request for unknown mode %u\n", cfg->mode); return 0; } - if (cfg->read_bufsize == 0) + if (cfg->read_bufsize == 0) { + LOGPTS(ts, DE1D, LOGL_NOTICE, "Client request for invalid bufsize %u\n", cfg->read_bufsize); return 0; + } /* If already open, close previous */ e1_ts_stop(ts); /* Init */ ret = _e1d_ts_start(ts, mode, cfg->read_bufsize); - if (ret < 0) + if (ret < 0) { + LOGPTS(ts, DE1D, LOGL_ERROR, "Unable to start timeslot: %d\n", ret); return ret; + } *rfd = ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icd47de13ab84b89ce5fb21c24713bae760611d32 Gerrit-Change-Number: 20074 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:10:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:10:30 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add support for osmo-e1d In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19929 ) Change subject: e1-prbs-test: Add support for osmo-e1d ...................................................................... e1-prbs-test: Add support for osmo-e1d This allows e1-prbs-test to not only use DAHDI devices, but also osmo-e1d supported devices Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 --- M contrib/e1-prbs-test/Makefile M contrib/e1-prbs-test/main.c 2 files changed, 68 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/e1-prbs-test/Makefile b/contrib/e1-prbs-test/Makefile index 172847f..598366a 100644 --- a/contrib/e1-prbs-test/Makefile +++ b/contrib/e1-prbs-test/Makefile @@ -1,5 +1,5 @@ -LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore) -LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore) +LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore libosmo-e1d) +LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore libosmo-e1d) CFLAGS=-O2 -g -Wall -Werror $(LIBOSMO_CFLAGS) LIBS=$(LIBOSMO_LIBS) diff --git a/contrib/e1-prbs-test/main.c b/contrib/e1-prbs-test/main.c index 4fe0e84..57cefc9 100644 --- a/contrib/e1-prbs-test/main.c +++ b/contrib/e1-prbs-test/main.c @@ -40,6 +40,8 @@ #include #include +#include + #include "internal.h" static struct test_state g_tst; @@ -69,12 +71,69 @@ return 0; } -static int open_slots(struct test_state *tst, const char *basedir) +static void init_timeslot(struct timeslot_state *ts) { - DIR *dir = opendir(basedir); + osmo_fd_register(&ts->ofd); + printf("E1TS(%02u) opened\n", ts->ofd.priv_nr); + + ts_init_prbs_tx(ts, g_prbs_offs_tx); + ts_init_prbs_rx(ts, g_prbs_offs_rx); + + /* start to put something into the transmit queue, before we get read-triggered + * later on */ + process_tx(ts, 1024); +} + +static int open_slots_e1d(struct test_state *tst, int intf_nr, int line_nr) +{ + struct osmo_e1dp_client *clnt = osmo_e1dp_client_create(NULL, E1DP_DEFAULT_SOCKET); + int i, rc, num_slots = 0; + + if (!clnt) { + fprintf(stderr, "Unable to connect to osmo-e1d\n"); + return -1; + } + + for (i = 1; i < 32; i++) { + struct timeslot_state *ts; + rc = osmo_e1dp_client_ts_open(clnt, intf_nr, line_nr, i, E1DP_TSMODE_RAW, 1024); + if (rc < 0) { + fprintf(stderr, "Error opening %d: %d (%s)\n", i, rc, strerror(errno)); + return -1; + } + ts = &tst->ts[tst->next_unused_ts++]; + + /* open the respective file descriptor */ + osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, i); + + init_timeslot(ts); + num_slots++; + } + + return num_slots; +} + +static int open_slots(struct test_state *tst, char *basedir) +{ + DIR *dir; struct dirent *ent; int rc, num_slots = 0; + if (!strncmp(basedir, "e1d", 3)) { + int intf = 0, line = 0; + char *intf_str, *line_str; + strtok(basedir, ":"); + intf_str = strtok(NULL, ":"); + if (intf_str) { + intf = atoi(intf_str); + line_str = strtok(NULL, ":"); + if (line_str) + line = atoi(line_str); + } + return open_slots_e1d(tst, intf, line); + } + + dir = opendir(basedir); if (!dir) return -ENOENT; @@ -99,15 +158,6 @@ /* open the respective file descriptor */ osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, atoi(ent->d_name)); - osmo_fd_register(&ts->ofd); - printf("E1TS(%02u) opened\n", ts->ofd.priv_nr); - - ts_init_prbs_tx(ts, g_prbs_offs_tx); - ts_init_prbs_rx(ts, g_prbs_offs_rx); - - /* start to put something into the transmit queue, before we get read-triggered - * later on */ - process_tx(ts, 1024); cfg_dahdi_buffer(ts->ofd.fd); struct dahdi_bufferinfo bi; @@ -115,6 +165,8 @@ OSMO_ASSERT(rc == 0); printf("tx_pol=%d, rx_pol=%d, num=%d, size=%d, nread=%d, nwrite=%d\n", bi.txbufpolicy, bi.rxbufpolicy, bi.numbufs, bi.bufsize, bi.readbufs, bi.writebufs); + + init_timeslot(ts); num_slots++; } closedir(dir); @@ -191,13 +243,15 @@ if (argc <= optind) { fprintf(stderr, "You must specify the base-path of your DAHDI span " - "like /dev/dahdi/chan/001\n"); + "like /dev/dahdi/chan/001 or e1d:0:0\n"); exit(1); } basedir = argv[optind]; set_realtime(10); rc = open_slots(&g_tst, basedir); + if (rc < 0) + exit(1); printf("==> opened a total of %d slots\n", rc); signal(SIGINT, sig_handler); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2 Gerrit-Change-Number: 19929 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:11:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:11:14 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 ) Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 2 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Comment-Date: Sat, 12 Sep 2020 19:11:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:11:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:11:29 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 ) Change subject: ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages ...................................................................... ipa_proto: Hook ipa_proto_ccm into the handling of CCM messages Change-Id: Ib1be00f73146519c8cc78bb08dd26a110771cd55 --- M src/ipa_proto.erl 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index 9a3f3d0..20e5a1b 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -261,15 +261,15 @@ end. % Respond with PONG to PING -process_ccm_msg(Socket, StreamID, ?IPAC_MSGT_PING, _) -> +process_ccm_msg(Socket, StreamID, ping, _) -> io:format("Socket ~p Stream ~p: PING -> PONG~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_ACK with ID_ACK -process_ccm_msg(Socket, StreamID, ?IPAC_MSGT_ID_ACK, _) -> +process_ccm_msg(Socket, StreamID, id_ack, _) -> io:format("Socket ~p Stream ~p: ID_ACK -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_RESP with ID_ACK -process_ccm_msg(Socket, StreamID, ?IPAC_MSGT_ID_RESP, _) -> +process_ccm_msg(Socket, StreamID, id_resp, _) -> io:format("Socket ~p Stream ~p: ID_RESP -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Default message handler for unknown messages @@ -279,7 +279,7 @@ % process an incoming CCM message (Stream ID 254) process_rx_ccm_msg(Socket, StreamID, PayloadBin) -> - [MsgType|Opts] = binary:bin_to_list(PayloadBin), + {MsgType, Opts} = ipa_proto_ccm:decode(PayloadBin), process_ccm_msg(Socket, StreamID, MsgType, Opts). send_ccm_id_get(Socket) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib1be00f73146519c8cc78bb08dd26a110771cd55 Gerrit-Change-Number: 20017 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:11:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:11:30 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Implement ccm response with variable options In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 ) Change subject: ipa_proto: Implement ccm response with variable options ...................................................................... ipa_proto: Implement ccm response with variable options This commit allows configuration of the ccm protocol options used when setting up an ipa connection with an external entity. The options record is kept alongside the socket in the socket-owning process loop, and used to fill the values in the ccm identity response. If additional CCM state were needed in the future this commit could be extended to keep generic state, with the options only representing one piece of the overall state. Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a --- A include/ipa.hrl M src/ipa_proto.erl 2 files changed, 83 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/ipa.hrl b/include/ipa.hrl new file mode 100644 index 0000000..352057f --- /dev/null +++ b/include/ipa.hrl @@ -0,0 +1,32 @@ +% (C) 2020 by Matt Johnson +% +% 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. + +-ifndef(IPA). +-define(IPA, true). + +-record(ipa_ccm_options, {serial_number, + unit_id, + mac_address, + location, + unit_type, + equipment_version, + sw_version, + unit_name + }). + +-endif. diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index 20e5a1b..e472b6c 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -23,6 +23,8 @@ -author('Harald Welte '). -compile(export_all). +-include("ipa.hrl"). + -define(TIMEOUT, 1000). -define(IPA_SOCKOPTS, [binary, {packet, 0}, {reuseaddr, true}, {active, false}]). @@ -91,6 +93,10 @@ controlling_process(Socket, StreamID, NewPid) -> call_sync_sock(Socket, {ipa_ctrl_proc, Socket, StreamID, NewPid}). +% Set the metadata required for the ipa CCM sub-protocol. +set_ccm_options(Socket, CcmOptions) -> + call_sync_sock(Socket, {ipa_set_ccm_options, Socket, CcmOptions}). + % unblock the socket from further processing unblock(Socket) -> send_ccm_id_get(Socket), @@ -113,6 +119,11 @@ [IpaSock] = ets:lookup(ipa_sockets, Socket), ets:delete(IpaSock#ipa_socket.streamTbl, {Socket, StreamID}), ets:insert_new(IpaSock#ipa_socket.streamTbl, {{Socket, StreamID}, NewPid}); +% server-side handler for set_ccm_options() +% set ccm protocol metadata options reported with connection setup. +request({ipa_set_ccm_options, Socket, CcmOptions}) -> + io:format("Setting ccm options for socket ~p to ~p~n", [Socket, CcmOptions]), + {ccm_options, CcmOptions}; % server-side handler for unblock() request({ipa_unblock, Socket}) -> io:format("Unblocking socket ~p~n", [Socket]), @@ -167,20 +178,20 @@ end. % process (split + deliver) an incoming IPA message -process_rx_ipa_msg(_S, _StreamMap, <<>>) -> +process_rx_ipa_msg(_S, _StreamMap, _, <<>>) -> ok; -process_rx_ipa_msg(S, StreamMap, Data) -> +process_rx_ipa_msg(S, StreamMap, CcmOptions, Data) -> {StreamID, PayloadBin, Trailer} = split_ipa_msg(Data), case StreamID of ?IPAC_PROTO_CCM -> - process_rx_ccm_msg(S, StreamID, PayloadBin); + process_rx_ccm_msg(S, StreamID, CcmOptions, PayloadBin); ?IPAC_PROTO_OSMO -> <> = PayloadBin, deliver_rx_ipa_msg(S, {osmo, ExtStreamID}, StreamMap, PayloadExt); _ -> deliver_rx_ipa_msg(S, StreamID, StreamMap, PayloadBin) end, - process_rx_ipa_msg(S, StreamMap, Trailer). + process_rx_ipa_msg(S, StreamMap, CcmOptions, Trailer). send_close_signal([]) -> ok; @@ -237,22 +248,29 @@ StreamMap = ets:new(stream_map, [set]), ets:insert(ipa_sockets, #ipa_socket{socket=Socket, ipaPid=self(), streamTbl=StreamMap}), CallingPid ! {ipa_init_sock_done, Socket}, - loop(Socket, StreamMap). + loop(Socket, StreamMap, #ipa_ccm_options{}). -loop(S, StreamMap) -> +loop(S, StreamMap, CcmOptions) -> receive {request, From, Request} -> - Reply = ipa_proto:request(Request), + case ipa_proto:request(Request) of + {ccm_options, NewCcmOptions} -> + NextCcmOptions = NewCcmOptions, + Reply = ok; + EmbeddedReply -> + NextCcmOptions = CcmOptions, + Reply = EmbeddedReply + end, ipa_proto:reply(From, Reply), - ipa_proto:loop(S, StreamMap); + ipa_proto:loop(S, StreamMap, NextCcmOptions); {ipa_send, S, StreamId, Data} -> send(S, StreamId, Data), - ipa_proto:loop(S, StreamMap); + ipa_proto:loop(S, StreamMap, CcmOptions); {tcp, S, Data} -> % process incoming IPA message and mark socket active once more - ipa_proto:process_rx_ipa_msg(S, StreamMap, Data), + ipa_proto:process_rx_ipa_msg(S, StreamMap, CcmOptions, Data), inet:setopts(S, [{active, once}]), - ipa_proto:loop(S, StreamMap); + ipa_proto:loop(S, StreamMap, CcmOptions); {tcp_closed, S} -> io:format("Socket ~w closed [~w]~n", [S,self()]), ipa_proto:process_tcp_closed(S, StreamMap), @@ -261,26 +279,42 @@ end. % Respond with PONG to PING -process_ccm_msg(Socket, StreamID, ping, _) -> +process_ccm_msg(Socket, StreamID, _, ping, _) -> io:format("Socket ~p Stream ~p: PING -> PONG~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_ACK with ID_ACK -process_ccm_msg(Socket, StreamID, id_ack, _) -> +process_ccm_msg(Socket, StreamID, _, id_ack, _) -> io:format("Socket ~p Stream ~p: ID_ACK -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); % Simply respond to ID_RESP with ID_ACK -process_ccm_msg(Socket, StreamID, id_resp, _) -> +process_ccm_msg(Socket, StreamID, _, id_resp, _) -> io:format("Socket ~p Stream ~p: ID_RESP -> ID_ACK~n", [Socket, StreamID]), send(Socket, StreamID, <>); +% Simply respond to ID_GET with ID_RESP +process_ccm_msg(Socket, StreamID, CcmOptions, id_req, _) -> + io:format("Socket ~p Stream ~p: ID_GET -> ID_RESP~n", [Socket, StreamID]), + CcmBin = ipa_proto_ccm:encode( + {id_resp, + [{string,serial_nr,CcmOptions#ipa_ccm_options.serial_number}, + {string,unit_id,CcmOptions#ipa_ccm_options.unit_id}, + {string,mac_address,CcmOptions#ipa_ccm_options.mac_address}, + {string,location,CcmOptions#ipa_ccm_options.location}, + {string,unit_type,CcmOptions#ipa_ccm_options.unit_type}, + {string,equip_vers,CcmOptions#ipa_ccm_options.equipment_version}, + {string,sw_version,CcmOptions#ipa_ccm_options.sw_version}, + {string,unit_name,CcmOptions#ipa_ccm_options.unit_name} + ]}), + send(Socket, StreamID, CcmBin); + % Default message handler for unknown messages -process_ccm_msg(Socket, StreamID, MsgType, Opts) -> +process_ccm_msg(Socket, StreamID, _, MsgType, Opts) -> io:format("Socket ~p Stream ~p: Unknown CCM message type ~p Opts ~p~n", [Socket, StreamID, MsgType, Opts]). % process an incoming CCM message (Stream ID 254) -process_rx_ccm_msg(Socket, StreamID, PayloadBin) -> +process_rx_ccm_msg(Socket, StreamID, CcmOptions, PayloadBin) -> {MsgType, Opts} = ipa_proto_ccm:decode(PayloadBin), - process_ccm_msg(Socket, StreamID, MsgType, Opts). + process_ccm_msg(Socket, StreamID, CcmOptions, MsgType, Opts). send_ccm_id_get(Socket) -> send(Socket, ?IPAC_PROTO_CCM, <>). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I3f67095f33f1ff826ad04dad72990bf79617149a Gerrit-Change-Number: 20018 Gerrit-PatchSet: 2 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:11:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:11:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: GSM_Types: fix extra indention tab In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20087 ) Change subject: library: GSM_Types: fix extra indention tab ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifece2e9fa782f173665e10fa9174403cccac7eb6 Gerrit-Change-Number: 20087 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:11:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:12:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:12:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Osmocom_Types: fix extra indention tab In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20088 ) Change subject: library: Osmocom_Types: fix extra indention tab ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib94fa74a7752f21ba8203a5de17ce2b10d800d16 Gerrit-Change-Number: 20088 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:12:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:12:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:12:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 ) Change subject: RAW_NS: f_init_ns_codec: add argument tc_idx to modify the port ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I465ad2c8580e74cce4dab46f4ec29a9043df9938 Gerrit-Change-Number: 20009 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:12:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:12:59 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 19:12:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: GSM_Types: fix extra indention tab In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20087 ) Change subject: library: GSM_Types: fix extra indention tab ...................................................................... library: GSM_Types: fix extra indention tab The top level context doesn't have an indent. Change-Id: Ifece2e9fa782f173665e10fa9174403cccac7eb6 --- M library/GSM_Types.ttcn 1 file changed, 202 insertions(+), 202 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 8625cc3..5340fee 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -12,223 +12,223 @@ module GSM_Types { - import from General_Types all; - import from Osmocom_Types all; +import from General_Types all; +import from Osmocom_Types all; - type integer GsmArfcn (0..1023); - type integer UmtsArfcn (0..16383); - type integer UmtsScramblingCode (0..511); - const integer GsmMaxFrameNumber := 26*51*2048; - type integer GsmFrameNumber (0..GsmMaxFrameNumber); - type integer GsmRxLev (0..63); - type integer GsmTsc (0..7) with { variant "FIELDLENGTH(8)" }; - type uint32_t GsmTmsi; - type OCT4 GprsTlli; - type hexstring GsmMcc length(3); - type hexstring GsmMnc length(2 .. 3); - type uint16_t GsmLac; - type uint16_t GsmCellId; +type integer GsmArfcn (0..1023); +type integer UmtsArfcn (0..16383); +type integer UmtsScramblingCode (0..511); +const integer GsmMaxFrameNumber := 26*51*2048; +type integer GsmFrameNumber (0..GsmMaxFrameNumber); +type integer GsmRxLev (0..63); +type integer GsmTsc (0..7) with { variant "FIELDLENGTH(8)" }; +type uint32_t GsmTmsi; +type OCT4 GprsTlli; +type hexstring GsmMcc length(3); +type hexstring GsmMnc length(2 .. 3); +type uint16_t GsmLac; +type uint16_t GsmCellId; - type enumerated GprsCodingScheme { - CS1, CS2, CS3, CS4 - }; +type enumerated GprsCodingScheme { + CS1, CS2, CS3, CS4 +}; - function f_gprs_blocksize(GprsCodingScheme cs) return integer { - select (cs) { - case (CS1) { return 22 } - case (CS2) { return 32 } - case (CS3) { return 38 } - case (CS3) { return 52 } - case else { - setverdict(fail, "Invalid GPRS CS ", cs); - mtc.stop; - } +function f_gprs_blocksize(GprsCodingScheme cs) return integer { + select (cs) { + case (CS1) { return 22 } + case (CS2) { return 32 } + case (CS3) { return 38 } + case (CS3) { return 52 } + case else { + setverdict(fail, "Invalid GPRS CS ", cs); + mtc.stop; } } +} - /* 10.5.2.8 */ - type enumerated ChannelNeeded { - CHAN_NEED_ANY (0), - CHAN_NEED_SDCCH (1), - CHAN_NEED_TCH_F (2), - CHAN_NEED_TCH_H (3) - } with { variant "FIELDLENGTH(2)" }; - type record ChannelNeeded12 { - ChannelNeeded second, - ChannelNeeded first - } with { variant "" }; +/* 10.5.2.8 */ +type enumerated ChannelNeeded { + CHAN_NEED_ANY (0), + CHAN_NEED_SDCCH (1), + CHAN_NEED_TCH_F (2), + CHAN_NEED_TCH_H (3) +} with { variant "FIELDLENGTH(2)" }; +type record ChannelNeeded12 { + ChannelNeeded second, + ChannelNeeded first +} with { variant "" }; - /* TS 48.058 9.3.1 Channel Number IE */ - type enumerated RslChanNr0 { - RSL_CHAN_NR_INVALID ('00000'B), - RSL_CHAN_NR_Bm_ACCH ('00001'B), - RSL_CHAN_NR_BCCH ('10000'B), - RSL_CHAN_NR_RACH ('10001'B), - RSL_CHAN_NR_PCH_AGCH ('10010'B), - RSL_CHAN_NR_OSMO_PDCH ('11000'B), - RSL_CHAN_NR_OSMO_CBCH4 ('11001'B), - RSL_CHAN_NR_OSMO_CBCH8 ('11010'B) - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +/* TS 48.058 9.3.1 Channel Number IE */ +type enumerated RslChanNr0 { + RSL_CHAN_NR_INVALID ('00000'B), + RSL_CHAN_NR_Bm_ACCH ('00001'B), + RSL_CHAN_NR_BCCH ('10000'B), + RSL_CHAN_NR_RACH ('10001'B), + RSL_CHAN_NR_PCH_AGCH ('10010'B), + RSL_CHAN_NR_OSMO_PDCH ('11000'B), + RSL_CHAN_NR_OSMO_CBCH4 ('11001'B), + RSL_CHAN_NR_OSMO_CBCH8 ('11010'B) +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type record RslChanNr2 { - BIT4 tag ('0001'B), - uint1_t sub_chan - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +type record RslChanNr2 { + BIT4 tag ('0001'B), + uint1_t sub_chan +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type record RslChanNr4 { - BIT3 tag ('001'B), - uint2_t sub_chan - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +type record RslChanNr4 { + BIT3 tag ('001'B), + uint2_t sub_chan +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type record RslChanNr8 { - BIT2 tag ('01'B), - uint3_t sub_chan - } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; +type record RslChanNr8 { + BIT2 tag ('01'B), + uint3_t sub_chan +} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" }; - type union RslChanNrU { - RslChanNr0 ch0, - RslChanNr2 lm, - RslChanNr4 sdcch4, - RslChanNr8 sdcch8 - } with { - variant "TAG(lm, tag = '0001'B; - sdcch4, tag = '001'B; - sdcch8, tag = '01'B; - ch0, OTHERWISE)" - variant "FIELDLENGTH(5)" - variant "FIELDORDER(msb)" - }; +type union RslChanNrU { + RslChanNr0 ch0, + RslChanNr2 lm, + RslChanNr4 sdcch4, + RslChanNr8 sdcch8 +} with { + variant "TAG(lm, tag = '0001'B; + sdcch4, tag = '001'B; + sdcch8, tag = '01'B; + ch0, OTHERWISE)" + variant "FIELDLENGTH(5)" + variant "FIELDORDER(msb)" +}; - type record RslChannelNr { - RslChanNrU u, - uint3_t tn - } with { variant "FIELDLENGTH(8)" variant "FIELDORDER(msb)" }; +type record RslChannelNr { + RslChanNrU u, + uint3_t tn +} with { variant "FIELDLENGTH(8)" variant "FIELDORDER(msb)" }; - template RslChannelNr t_RslChanNr0(template uint3_t tn, template RslChanNr0 cht) := { - u := { ch0 := cht }, - tn := tn +template RslChannelNr t_RslChanNr0(template uint3_t tn, template RslChanNr0 cht) := { + u := { ch0 := cht }, + tn := tn +} + +template RslChannelNr t_RslChanNr_RACH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_RACH); +template RslChannelNr t_RslChanNr_BCCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_BCCH); +template RslChannelNr t_RslChanNr_PCH_AGCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); +template RslChannelNr t_RslChanNr_Bm(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); +template RslChannelNr t_RslChanNr_PDCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); +template RslChannelNr t_RslChanNr_CBCH4(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); +template RslChannelNr t_RslChanNr_CBCH8(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); +template RslChannelNr t_RslChanNr_Lm(template uint3_t tn, template uint1_t sub_slot) := { + u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, + tn := tn +} +template RslChannelNr t_RslChanNr_SDCCH4(template uint3_t tn, template uint2_t sub_slot) := { + u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, + tn := tn +} +template RslChannelNr t_RslChanNr_SDCCH8(template uint3_t tn, template uint3_t sub_slot) := { + u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, + tn := tn +} + +template (value) RslChannelNr ts_RslChanNr0(uint3_t tn, RslChanNr0 cht) := { + u := { ch0 := cht }, + tn := tn +} +template (value) RslChannelNr ts_RslChanNr_RACH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_RACH); +template (value) RslChannelNr ts_RslChanNr_BCCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_BCCH); +template (value) RslChannelNr ts_RslChanNr_PCH_AGCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); +template (value) RslChannelNr ts_RslChanNr_Bm(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); +template (value) RslChannelNr ts_RslChanNr_PDCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); +template (value) RslChannelNr ts_RslChanNr_CBCH4(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); +template (value) RslChannelNr ts_RslChanNr_CBCH8(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); +template (value) RslChannelNr ts_RslChanNr_Lm(uint3_t tn, uint1_t sub_slot) := { + u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, + tn := tn +} +template (value) RslChannelNr ts_RslChanNr_SDCCH4(uint3_t tn, uint2_t sub_slot) := { + u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, + tn := tn +} +template (value) RslChannelNr ts_RslChanNr_SDCCH8(uint3_t tn, uint3_t sub_slot) := { + u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, + tn := tn +} + +/* TS 48.058 9.3.2 Link ID */ +type enumerated RslLinkIdC { + FACCH_SDCCH (0), + SACCH (1), + OSMO_PTCCH (2) /* Osmocom (trxcon) specific extension */ +} with { variant "FIELDLENGTH(2)" }; + +type enumerated RslSapi0Prio { + SAPI0_PRIO_NORMAL (0), + SAPI0_PRIO_HIGH (1), + SAPI0_PRIO_LOW (2) +} with { variant "FIELDLENGTH(2)" }; + +type uint3_t GsmSapi; + +type record RslLinkId { + RslLinkIdC c, + boolean na, + RslSapi0Prio prio, + GsmSapi sapi +} with { variant "" }; + +template RslLinkId tr_RslLinkId := { + c := ?, + na := ?, + prio := ?, + sapi := ? +}; + +template RslLinkId tr_RslLinkID_DCCH(template GsmSapi sapi) modifies tr_RslLinkId := { + c := FACCH_SDCCH, + na := false, + sapi := sapi +}; + +template RslLinkId tr_RslLinkID_SACCH(template GsmSapi sapi) modifies tr_RslLinkId := { + c := SACCH, + na := false, + sapi := sapi +}; + +template RslLinkId tr_RslLinkID_OSMO_PTCCH(template GsmSapi sapi) modifies tr_RslLinkId := { + c := OSMO_PTCCH, + na := false, + sapi := sapi +}; + +template (value) RslLinkId ts_RslLinkID_DCCH(GsmSapi sapi) := { + c := FACCH_SDCCH, + na := false, + prio := SAPI0_PRIO_NORMAL, + sapi := sapi +}; + +template (value) RslLinkId ts_RslLinkID_SACCH(GsmSapi sapi) := { + c := SACCH, + na := false, + prio := SAPI0_PRIO_NORMAL, + sapi := sapi +}; + +template (value) RslLinkId ts_RslLinkID_OSMO_PTCCH(GsmSapi sapi) := { + c := OSMO_PTCCH, + na := false, + prio := SAPI0_PRIO_NORMAL, + sapi := sapi +}; + +function f_hex_is_odd_length(hexstring digits) return bitstring { + if (lengthof(digits) rem 2 == 1) { + return '1'B; + } else { + return '0'B; } - - template RslChannelNr t_RslChanNr_RACH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_RACH); - template RslChannelNr t_RslChanNr_BCCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_BCCH); - template RslChannelNr t_RslChanNr_PCH_AGCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); - template RslChannelNr t_RslChanNr_Bm(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); - template RslChannelNr t_RslChanNr_PDCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); - template RslChannelNr t_RslChanNr_CBCH4(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); - template RslChannelNr t_RslChanNr_CBCH8(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); - template RslChannelNr t_RslChanNr_Lm(template uint3_t tn, template uint1_t sub_slot) := { - u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, - tn := tn - } - template RslChannelNr t_RslChanNr_SDCCH4(template uint3_t tn, template uint2_t sub_slot) := { - u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, - tn := tn - } - template RslChannelNr t_RslChanNr_SDCCH8(template uint3_t tn, template uint3_t sub_slot) := { - u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, - tn := tn - } - - template (value) RslChannelNr ts_RslChanNr0(uint3_t tn, RslChanNr0 cht) := { - u := { ch0 := cht }, - tn := tn - } - template (value) RslChannelNr ts_RslChanNr_RACH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_RACH); - template (value) RslChannelNr ts_RslChanNr_BCCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_BCCH); - template (value) RslChannelNr ts_RslChanNr_PCH_AGCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH); - template (value) RslChannelNr ts_RslChanNr_Bm(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH); - template (value) RslChannelNr ts_RslChanNr_PDCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH); - template (value) RslChannelNr ts_RslChanNr_CBCH4(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4); - template (value) RslChannelNr ts_RslChanNr_CBCH8(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8); - template (value) RslChannelNr ts_RslChanNr_Lm(uint3_t tn, uint1_t sub_slot) := { - u := { lm := { tag := '0001'B, sub_chan := sub_slot } }, - tn := tn - } - template (value) RslChannelNr ts_RslChanNr_SDCCH4(uint3_t tn, uint2_t sub_slot) := { - u := { sdcch4 := { tag := '001'B, sub_chan := sub_slot } }, - tn := tn - } - template (value) RslChannelNr ts_RslChanNr_SDCCH8(uint3_t tn, uint3_t sub_slot) := { - u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } }, - tn := tn - } - - /* TS 48.058 9.3.2 Link ID */ - type enumerated RslLinkIdC { - FACCH_SDCCH (0), - SACCH (1), - OSMO_PTCCH (2) /* Osmocom (trxcon) specific extension */ - } with { variant "FIELDLENGTH(2)" }; - - type enumerated RslSapi0Prio { - SAPI0_PRIO_NORMAL (0), - SAPI0_PRIO_HIGH (1), - SAPI0_PRIO_LOW (2) - } with { variant "FIELDLENGTH(2)" }; - - type uint3_t GsmSapi; - - type record RslLinkId { - RslLinkIdC c, - boolean na, - RslSapi0Prio prio, - GsmSapi sapi - } with { variant "" }; - - template RslLinkId tr_RslLinkId := { - c := ?, - na := ?, - prio := ?, - sapi := ? - }; - - template RslLinkId tr_RslLinkID_DCCH(template GsmSapi sapi) modifies tr_RslLinkId := { - c := FACCH_SDCCH, - na := false, - sapi := sapi - }; - - template RslLinkId tr_RslLinkID_SACCH(template GsmSapi sapi) modifies tr_RslLinkId := { - c := SACCH, - na := false, - sapi := sapi - }; - - template RslLinkId tr_RslLinkID_OSMO_PTCCH(template GsmSapi sapi) modifies tr_RslLinkId := { - c := OSMO_PTCCH, - na := false, - sapi := sapi - }; - - template (value) RslLinkId ts_RslLinkID_DCCH(GsmSapi sapi) := { - c := FACCH_SDCCH, - na := false, - prio := SAPI0_PRIO_NORMAL, - sapi := sapi - }; - - template (value) RslLinkId ts_RslLinkID_SACCH(GsmSapi sapi) := { - c := SACCH, - na := false, - prio := SAPI0_PRIO_NORMAL, - sapi := sapi - }; - - template (value) RslLinkId ts_RslLinkID_OSMO_PTCCH(GsmSapi sapi) := { - c := OSMO_PTCCH, - na := false, - prio := SAPI0_PRIO_NORMAL, - sapi := sapi - }; - - function f_hex_is_odd_length(hexstring digits) return bitstring { - if (lengthof(digits) rem 2 == 1) { - return '1'B; - } else { - return '0'B; - } - } +} /* TS 04.12 Section 3.3.1 Block type */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifece2e9fa782f173665e10fa9174403cccac7eb6 Gerrit-Change-Number: 20087 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:13:03 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 19:13:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: Osmocom_Types: fix extra indention tab In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20088 ) Change subject: library: Osmocom_Types: fix extra indention tab ...................................................................... library: Osmocom_Types: fix extra indention tab The top level context doesn't have an indent. Change-Id: Ib94fa74a7752f21ba8203a5de17ce2b10d800d16 --- M library/Osmocom_Types.ttcn 1 file changed, 69 insertions(+), 69 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 6281280..1993ae1 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -10,90 +10,90 @@ module Osmocom_Types { - import from General_Types all; +import from General_Types all; - type integer uint8_t (0..255) with { variant "unsigned 8 bit" }; - type integer uint16_t (0..65535) with { variant "unsigned 16 bit" }; - type integer uint24_t (0..16777215) with { variant "unsigned 24 bit" }; - type integer uint32_t (0..4294967295) with { variant "unsigned 32 bit" }; +type integer uint8_t (0..255) with { variant "unsigned 8 bit" }; +type integer uint16_t (0..65535) with { variant "unsigned 16 bit" }; +type integer uint24_t (0..16777215) with { variant "unsigned 24 bit" }; +type integer uint32_t (0..4294967295) with { variant "unsigned 32 bit" }; - type integer int8_t (-128..127) with { variant "8 bit" }; - type integer int16_t (-32768..32767) with { variant "16 bit" }; +type integer int8_t (-128..127) with { variant "8 bit" }; +type integer int16_t (-32768..32767) with { variant "16 bit" }; - type integer uint1_t (0..1) with { variant "unsigned 1 bit" }; - type integer uint2_t (0..3) with { variant "unsigned 2 bit" }; - type integer uint3_t (0..7) with { variant "unsigned 3 bit" }; - type integer uint4_t (0..15) with { variant "unsigned 4 bit" }; - type integer uint5_t (0..31) with { variant "unsigned 5 bit" }; - type integer uint6_t (0..63) with { variant "unsigned 6 bit" }; - type integer uint7_t (0..127) with { variant "unsigned 7 bit" }; - type integer uint9_t (0..511) with { variant "unsigned 9 bit" }; - type integer uint10_t (0..1023) with { variant "unsigned 10 bit" }; - type integer uint11_t (0..2047) with { variant "unsigned 11 bit" }; - type integer uint12_t (0..4095) with { variant "unsigned 12 bit" }; - type integer uint13_t (0..8191) with { variant "unsigned 13 bit" }; - type integer uint14_t (0..16383) with { variant "unsigned 14 bit" }; - type integer uint15_t (0..32767) with { variant "unsigned 15 bit" }; - type integer uint40_t (0..1099511627776) with { variant "unsigned 40 bit" }; +type integer uint1_t (0..1) with { variant "unsigned 1 bit" }; +type integer uint2_t (0..3) with { variant "unsigned 2 bit" }; +type integer uint3_t (0..7) with { variant "unsigned 3 bit" }; +type integer uint4_t (0..15) with { variant "unsigned 4 bit" }; +type integer uint5_t (0..31) with { variant "unsigned 5 bit" }; +type integer uint6_t (0..63) with { variant "unsigned 6 bit" }; +type integer uint7_t (0..127) with { variant "unsigned 7 bit" }; +type integer uint9_t (0..511) with { variant "unsigned 9 bit" }; +type integer uint10_t (0..1023) with { variant "unsigned 10 bit" }; +type integer uint11_t (0..2047) with { variant "unsigned 11 bit" }; +type integer uint12_t (0..4095) with { variant "unsigned 12 bit" }; +type integer uint13_t (0..8191) with { variant "unsigned 13 bit" }; +type integer uint14_t (0..16383) with { variant "unsigned 14 bit" }; +type integer uint15_t (0..32767) with { variant "unsigned 15 bit" }; +type integer uint40_t (0..1099511627776) with { variant "unsigned 40 bit" }; - const uint16_t c_UINT16_MAX := 65535; - const uint32_t c_UINT32_MAX := 4294967295; +const uint16_t c_UINT16_MAX := 65535; +const uint32_t c_UINT32_MAX := 4294967295; - /* CSN.1 L/H placeholders */ - const BIT1 CSN1_L := '0'B; - const BIT1 CSN1_H := '1'B; +/* CSN.1 L/H placeholders */ +const BIT1 CSN1_L := '0'B; +const BIT1 CSN1_H := '1'B; - type record Arfcn { - boolean pcs, - uint15_t arfcn - } with { variant "" }; +type record Arfcn { + boolean pcs, + uint15_t arfcn +} with { variant "" }; - /* return random integer 0 <= ret < max. According to ETSI ES 201 873 C.6.1, rnd() returns *less* than 1, so - * the returned int will always be ret < max, or ret <= (max-1). */ - function f_rnd_int(integer max) return integer { - return float2int(rnd()*int2float(max)); +/* return random integer 0 <= ret < max. According to ETSI ES 201 873 C.6.1, rnd() returns *less* than 1, so + * the returned int will always be ret < max, or ret <= (max-1). */ +function f_rnd_int(integer max) return integer { + return float2int(rnd()*int2float(max)); +} + +/* return hexstring composed of random digits */ +function f_rnd_hexstring(in integer len, in integer max := 15) return hexstring { + var integer i; + var hexstring ret := ''H; + for (i := 0; i < len; i := i + 1) { + ret := ret & int2hex(f_rnd_int(max), 1); } + return ret; +} - /* return hexstring composed of random digits */ - function f_rnd_hexstring(in integer len, in integer max := 15) return hexstring { - var integer i; - var hexstring ret := ''H; - for (i := 0; i < len; i := i + 1) { - ret := ret & int2hex(f_rnd_int(max), 1); - } - return ret; +/* return octetstring composed of random bytes */ +function f_rnd_octstring(in integer len) return octetstring { + var integer i; + var octetstring ret := ''O; + for (i := 0; i < len; i := i + 1) { + ret := ret & int2oct(f_rnd_int(255), 1); } + return ret; +} - /* return octetstring composed of random bytes */ - function f_rnd_octstring(in integer len) return octetstring { - var integer i; - var octetstring ret := ''O; - for (i := 0; i < len; i := i + 1) { - ret := ret & int2oct(f_rnd_int(255), 1); - } - return ret; - } +/* return bitstring composed of random bits */ +function f_rnd_bitstring(in integer len) return bitstring { + var octetstring oct := f_rnd_octstring(len / 8 + 1); + return substr(oct2bit(oct), 0, len); +} - /* return bitstring composed of random bits */ - function f_rnd_bitstring(in integer len) return bitstring { - var octetstring oct := f_rnd_octstring(len / 8 + 1); - return substr(oct2bit(oct), 0, len); - } +function f_rnd_imsi(in hexstring prefix) return hexstring { + return prefix & f_rnd_hexstring(15 - lengthof(prefix), 9); +} - function f_rnd_imsi(in hexstring prefix) return hexstring { - return prefix & f_rnd_hexstring(15 - lengthof(prefix), 9); - } +function f_rnd_msisdn(in octetstring prefix, integer len := 6) return octetstring { + return prefix & f_rnd_octstring(len - lengthof(prefix)); +} - function f_rnd_msisdn(in octetstring prefix, integer len := 6) return octetstring { - return prefix & f_rnd_octstring(len - lengthof(prefix)); - } - - function f_sleep(float seconds) { - timer T := seconds; - T.start; - T.timeout; - } +function f_sleep(float seconds) { + timer T := seconds; + T.start; + T.timeout; +} function bool2bit(boolean inp) return BIT1 { if (inp) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib94fa74a7752f21ba8203a5de17ce2b10d800d16 Gerrit-Change-Number: 20088 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:13:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:13:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: remove usage of mp_nsconfig In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20089 ) Change subject: RAW_NS: remove usage of mp_nsconfig ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ida8b8a6af815dc11b2ff4c65e19cc5ec25f18ae2 Gerrit-Change-Number: 20089 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:13:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:13:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:13:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RAW_NS: remove usage of mp_gb_cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20090 ) Change subject: RAW_NS: remove usage of mp_gb_cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I91d9db85519675054aaab83c85fac43e67391f33 Gerrit-Change-Number: 20090 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:13:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:14:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:14:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: migrate RAW_NS to library Osmocom_RAW_NS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 ) Change subject: migrate RAW_NS to library Osmocom_RAW_NS ...................................................................... Patch Set 1: we don't generally prefix our libraries with Osmocom in TTCN3. See library/BSSGP_* and library/NS_* So I don't think the rename should be done. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 Gerrit-Change-Number: 20091 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:14:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:15:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 12 Sep 2020 19:15:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 ) Change subject: SGSN: introduce NS tests ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 12 Sep 2020 19:15:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 19:59:19 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 12 Sep 2020 19:59:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: migrate RAW_NS to library Osmocom_RAW_NS In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 ) Change subject: migrate RAW_NS to library Osmocom_RAW_NS ...................................................................... Patch Set 1: > Patch Set 1: > > we don't generally prefix our libraries with Osmocom in TTCN3. See library/BSSGP_* and library/NS_* > > So I don't think the rename should be done. Ok. I'll drop the renaming and leave it as it is. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 Gerrit-Change-Number: 20091 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 12 Sep 2020 19:59:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 12 23:44:25 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 12 Sep 2020 23:44:25 +0000 Subject: Change in osmo-bsc[master]: paging: do not set bsub->lac during Paging Request / drop bsub->lac References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20103 ) Change subject: paging: do not set bsub->lac during Paging Request / drop bsub->lac ...................................................................... paging: do not set bsub->lac during Paging Request / drop bsub->lac It does not make sense to set the bsc_subscr's LAC from a Paging Request, especially since the paging code has loops that possibly kick off several pagings. To not cause any functional change for locked_paging_bts(), pass the LAC as function parameter instead of in the subscr->lac. (BTW, I suspect that the locked_paging_bts() condition for the LAC does not make much sense, seems to be an early non-feature of OpenBSC. Why page on an RF-locked BTS?? I don't understand, hence leaving the behavior unchanged.) At this point, there remains no code setting bsub->lac anywhere. We could set it during rx of Complete Layer 3, but since there is no use for it besides a vty dump, let's just drop the bsub->lac completely, and the vty dump of it. Change-Id: Id017bd494d329b6fc254d7135b4074ac2b224d66 --- M include/osmocom/bsc/bsc_subscriber.h M include/osmocom/bsc/osmo_bsc_grace.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_grace.c 5 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/20103/1 diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index 53fa7be..a602a9e 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -16,7 +16,6 @@ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; uint32_t tmsi; - uint16_t lac; }; const char *bsc_subscr_name(struct bsc_subscr *bsub); diff --git a/include/osmocom/bsc/osmo_bsc_grace.h b/include/osmocom/bsc/osmo_bsc_grace.h index d78e41c..cc613be 100644 --- a/include/osmocom/bsc/osmo_bsc_grace.h +++ b/include/osmocom/bsc/osmo_bsc_grace.h @@ -31,6 +31,7 @@ struct bsc_subscr *subscr, int chan_needed, struct bsc_msc_data *msc, - struct gsm_bts *bts); + struct gsm_bts *bts, + uint16_t lac); #endif diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 3524506..8197320 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -6154,7 +6154,7 @@ static void dump_one_sub(struct vty *vty, struct bsc_subscr *bsub) { - vty_out(vty, " %15s %08x %5u %d%s", bsub->imsi, bsub->tmsi, bsub->lac, bsub->use_count, + vty_out(vty, " %15s %08x %d%s", bsub->imsi, bsub->tmsi, bsub->use_count, VTY_NEWLINE); } @@ -6165,8 +6165,8 @@ { struct bsc_subscr *bsc_subscr; - vty_out(vty, " IMSI TMSI LAC Use%s", VTY_NEWLINE); - /* " 001010123456789 ffffffff 65534 1" */ + vty_out(vty, " IMSI TMSI Use%s", VTY_NEWLINE); + /* " 001010123456789 ffffffff 1" */ llist_for_each_entry(bsc_subscr, bsc_gsmnet->bsc_subscribers, entry) dump_one_sub(vty, bsc_subscr); diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index a253b01..2b51787 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -135,10 +135,9 @@ return; } - subscr->lac = lac; subscr->tmsi = tmsi; - ret = bsc_grace_paging_request(msc->network->rf_ctrl->policy, subscr, chan_needed, msc, bts); + ret = bsc_grace_paging_request(msc->network->rf_ctrl->policy, subscr, chan_needed, msc, bts, lac); if (ret == 0) LOGP(DMSC, LOGL_INFO, "Paging request failed or repeated paging: BTS: %d IMSI: '%s' TMSI: '0x%x/%u' LAC: 0x%x\n", bts->nr, mi_string, tmsi, tmsi, lac); diff --git a/src/osmo-bsc/osmo_bsc_grace.c b/src/osmo-bsc/osmo_bsc_grace.c index a26a716..628992e 100644 --- a/src/osmo-bsc/osmo_bsc_grace.c +++ b/src/osmo-bsc/osmo_bsc_grace.c @@ -38,6 +38,7 @@ /* Return value is like paging_request_bts(): * returns 1 on success (one BTS was paged); 0 in case of error (e.g. TRX down) */ static int locked_paging_bts(struct gsm_bts *bts, + uint16_t lac, struct bsc_subscr *subscr, int chan_needed, struct bsc_msc_data *msc) @@ -47,7 +48,7 @@ return 0; /* in case of no lac patching is in place, check the BTS */ - if (msc->core_lac == -1 && subscr->lac != bts->location_area_code) + if (msc->core_lac == -1 && lac != bts->location_area_code) return 0; return paging_request_bts(bts, subscr, chan_needed, msc); @@ -66,9 +67,10 @@ struct bsc_subscr *subscr, int chan_needed, struct bsc_msc_data *msc, - struct gsm_bts *bts) + struct gsm_bts *bts, + uint16_t lac) { if (rf_policy == S_RF_ON) return paging_request_bts(bts, subscr, chan_needed, msc); - return locked_paging_bts(bts, subscr, chan_needed, msc); + return locked_paging_bts(bts, lac, subscr, chan_needed, msc); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id017bd494d329b6fc254d7135b4074ac2b224d66 Gerrit-Change-Number: 20103 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Sep 13 01:35:12 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 Sep 2020 01:35:12 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f5d775fa870d_1c8f2b0c998c45f876586b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 157s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 157s] [COMPILING libboard/qmod/source/card_pres.c] [ 157s] [COMPILING libboard/qmod/source/wwan_led.c] [ 157s] [COMPILING libboard/qmod/source/i2c.c] [ 157s] [COMPILING libboard/qmod/source/board_qmod.c] [ 158s] [COMPILING apps/dfu/main.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 158s] Memory region Used Size Region Size %age Used [ 158s] rom: 16588 B 16 KB 101.25% [ 158s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 158s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 158s] collect2: error: ld returned 1 exit status [ 158s] % [ 158s] make[2]: *** [Makefile:234: flash] Error 1 [ 158s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 158s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 158s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 158s] dh_auto_build: error: make -j1 returned exit code 2 [ 158s] make: *** [debian/rules:16: build] Error 25 [ 158s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 158s] ### VM INTERACTION START ### [ 161s] [ 152.647422] sysrq: Power Off [ 161s] [ 152.655524] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] lamb54 failed "build simtrace2_0.7.0.63.39070.dsc" at Sun Sep 13 01:35:01 UTC 2020. [ 162s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Sep 13 06:48:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 13 Sep 2020 06:48:41 +0000 Subject: Change in osmo-bsc[master]: paging: do not set bsub->lac during Paging Request / drop bsub->lac In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20103 ) Change subject: paging: do not set bsub->lac during Paging Request / drop bsub->lac ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id017bd494d329b6fc254d7135b4074ac2b224d66 Gerrit-Change-Number: 20103 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 13 Sep 2020 06:48:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 13 06:49:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 13 Sep 2020 06:49:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set verdict to pass when TC_emerg_premption is done In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20086 ) Change subject: BSC_Tests: set verdict to pass when TC_emerg_premption is done ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie612b32cfa9cedd1e0f1d51e48911da94ec325cf Gerrit-Change-Number: 20086 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 13 Sep 2020 06:49:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 13 08:04:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 13 Sep 2020 08:04:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: move some key types from GSM_RR_Types to GSM_Types References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20104 ) Change subject: move some key types from GSM_RR_Types to GSM_Types ...................................................................... move some key types from GSM_RR_Types to GSM_Types This in turn means Osmocom_Gb_Types doesn't need to depend on GSM_RR_Types anymore, which is particularly ugly as the latter now depends on RLCMAC_*, creating a long chain of dependencies. Change-Id: I8c8da7709695ff0023f71b3999291e2515b22e46 --- M library/GSM_RR_Types.ttcn M library/GSM_Types.ttcn M library/Osmocom_Gb_Types.ttcn 3 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/20104/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 2cb50bc..b7e02ec 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -135,8 +135,6 @@ } with { variant "FIELDLENGTH(8)" }; type octetstring RestOctets with { variant "PADDING(yes), PADDING_PATTERN('00101011'B)" }; - type hexstring GsmBcdString with { variant "HEXORDER(low)" }; - type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" }; type record L2PseudoLength { uint6_t l2_plen, @@ -219,18 +217,9 @@ hsn := hsn }; - /* TS 24.008 10.5.1.1 */ - type uint16_t CellIdentity; - /* TS 24.008 10.5.1.2 */ type uint4_t CipheringKeySeqNr (0..7); - /* 24.008 10.5.1.3 */ - type record LocationAreaIdentification { - BcdMccMnc mcc_mnc, - uint16_t lac - } with { variant "" }; - /* TS 24.008 10.5.1.4 */ type enumerated MobileIdentityType { MI_TYPE_NONE (0), @@ -424,15 +413,6 @@ uint3_t non_drx_timer } with { variant "" }; - /* 24.008 10.5.5.15 */ - type record RoutingAreaIdentification { - LocationAreaIdentification lai, - uint8_t rac - } with { variant "" }; - - external function enc_RoutingAreaIdentification(RoutingAreaIdentification rai) return octetstring - with { extension "prototype(convert)" extension "encode(RAW)" } - /* 44.018 10.5.2.16 */ type record IaRestOctHL { uint6_t freq_par_len, diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 5340fee..ee6635b 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -356,5 +356,26 @@ return (fn / 51) mod 8; } +type hexstring GsmBcdString with { variant "HEXORDER(low)" }; +type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" }; + +/* 24.008 10.5.1.3 */ +type record LocationAreaIdentification { + BcdMccMnc mcc_mnc, + uint16_t lac +} with { variant "" }; + +/* 24.008 10.5.5.15 */ +type record RoutingAreaIdentification { + LocationAreaIdentification lai, + uint8_t rac +} with { variant "" }; + +external function enc_RoutingAreaIdentification(RoutingAreaIdentification rai) return octetstring +with { extension "prototype(convert)" extension "encode(RAW)" } + +/* TS 24.008 10.5.1.1 */ +type uint16_t CellIdentity; + } with { encode "RAW"; variant "FIELDORDER(msb)" } diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 7ddaada..c5b0953 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -6,7 +6,6 @@ import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; - import from GSM_RR_Types all; import from BSSGP_Types all import from NS_Types all import from Native_Functions all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c8da7709695ff0023f71b3999291e2515b22e46 Gerrit-Change-Number: 20104 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 13 08:04:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 13 Sep 2020 08:04:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: lib: Move ts_RaCapRec from RLCMAC_CSN1_Templates to L3_Templates References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20105 ) Change subject: lib: Move ts_RaCapRec from RLCMAC_CSN1_Templates to L3_Templates ...................................................................... lib: Move ts_RaCapRec from RLCMAC_CSN1_Templates to L3_Templates There is no reason whatsoevery why a L3_Templates.ttcn file should ever include types from RLC/MAC. This creates a dependency nightmare. The type for which ts_RaCapRec is written (MSRACapabilityValuesRecord) originates from titan.ProtocolModules.MobileL3 so it's completely unclear how any of that ever related too RLC/MAC. Change-Id: Ie1ccef090ad51e26ccae17998e4294c6e27cf9c8 --- M library/L3_Templates.ttcn M library/RLCMAC_CSN1_Templates.ttcn 2 files changed, 52 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/20105/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 8c0f494..2ef8773 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -20,7 +20,6 @@ import from MobileL3_CC_Types all; import from MobileL3_GMM_SM_Types all; import from MobileL3_SMS_Types all; -import from RLCMAC_CSN1_Templates all; /* TS 24.007 Table 11.3 TI Flag */ const BIT1 c_TIF_ORIG := '0'B; @@ -2095,6 +2094,58 @@ cnSpecificDRXCycleLength := '0000'B /* SI value used */ }; +private function f_presence_bit_MultislotCap_GPRS(template (omit) MultislotCap_GPRS mscap_gprs) return BIT1 { + if (istemplatekind(mscap_gprs, "omit")) { + return '0'B; + } + return '1'B; +} +private function f_presence_bit_MultislotCap_EGPRS(template (omit) MultislotCap_EGPRS mscap_egprs) return BIT1 { + if (istemplatekind(mscap_egprs, "omit")) { + return '0'B; + } + return '1'B; +} +template (value) MSRACapabilityValuesRecord ts_RaCapRec(BIT4 att := '0001'B /* E-GSM */, template (omit) MultislotCap_GPRS mscap_gprs := omit, template (omit) MultislotCap_EGPRS mscap_egprs := omit) := { + mSRACapabilityValues := { + mSRACapabilityValuesExclude1111 := { + accessTechnType := att, /* E-GSM */ + accessCapabilities := { + lengthIndicator := 0, /* overwritten */ + accessCapabilities := { + rfPowerCapability := '001'B, /* FIXME */ + presenceBitA5 := '0'B, + a5bits := omit, + esind := '1'B, + psbit := '0'B, + vgcs := '0'B, + vbs := '0'B, + presenceBitMultislot := '1'B, + multislotcap := { + presenceBitHscsd := '0'B, + hscsdmultislotclass := omit, + presenceBitGprs := f_presence_bit_MultislotCap_GPRS(mscap_gprs), + gprsmultislot := mscap_gprs, + presenceBitSms := '0'B, + multislotCap_SMS := omit, + multislotCapAdditionsAfterRel97 := { + presenceBitEcsdmulti := '0'B, + ecsdmultislotclass := omit, + presenceBitEgprsmulti := f_presence_bit_MultislotCap_EGPRS(mscap_egprs), + multislotCap_EGPRS := mscap_egprs, + presenceBitDtmGprsmulti := '0'B, + multislotCapdtmgprsmultislotsubclass := omit + } + }, + accessCapAdditionsAfterRel97 := omit + }, + spare_bits := omit + } + } + }, + presenceBitMSRACap := '0'B +}; + template (value) MSRadioAccessCapabilityLV ts_MS_RaCapa := { lengthIndicator := 0, /* overwritten */ msRadioAccessCapabilityV := { diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn index 0d7de99..21a7c46 100644 --- a/library/RLCMAC_CSN1_Templates.ttcn +++ b/library/RLCMAC_CSN1_Templates.ttcn @@ -55,58 +55,6 @@ } } - private function f_presence_bit_MultislotCap_GPRS(template (omit) MultislotCap_GPRS mscap_gprs) return BIT1 { - if (istemplatekind(mscap_gprs, "omit")) { - return '0'B; - } - return '1'B; - } - private function f_presence_bit_MultislotCap_EGPRS(template (omit) MultislotCap_EGPRS mscap_egprs) return BIT1 { - if (istemplatekind(mscap_egprs, "omit")) { - return '0'B; - } - return '1'B; - } - template (value) MSRACapabilityValuesRecord ts_RaCapRec(BIT4 att := '0001'B /* E-GSM */, template (omit) MultislotCap_GPRS mscap_gprs := omit, template (omit) MultislotCap_EGPRS mscap_egprs := omit) := { - mSRACapabilityValues := { - mSRACapabilityValuesExclude1111 := { - accessTechnType := att, /* E-GSM */ - accessCapabilities := { - lengthIndicator := 0, /* overwritten */ - accessCapabilities := { - rfPowerCapability := '001'B, /* FIXME */ - presenceBitA5 := '0'B, - a5bits := omit, - esind := '1'B, - psbit := '0'B, - vgcs := '0'B, - vbs := '0'B, - presenceBitMultislot := '1'B, - multislotcap := { - presenceBitHscsd := '0'B, - hscsdmultislotclass := omit, - presenceBitGprs := f_presence_bit_MultislotCap_GPRS(mscap_gprs), - gprsmultislot := mscap_gprs, - presenceBitSms := '0'B, - multislotCap_SMS := omit, - multislotCapAdditionsAfterRel97 := { - presenceBitEcsdmulti := '0'B, - ecsdmultislotclass := omit, - presenceBitEgprsmulti := f_presence_bit_MultislotCap_EGPRS(mscap_egprs), - multislotCap_EGPRS := mscap_egprs, - presenceBitDtmGprsmulti := '0'B, - multislotCapdtmgprsmultislotsubclass := omit - } - }, - accessCapAdditionsAfterRel97 := omit - }, - spare_bits := omit - } - } - }, - presenceBitMSRACap := '0'B - }; - private function f_presence_bit_MSRadioAccessCapabilityV(template (omit) MSRadioAccessCapabilityV ms_rac) return BIT1 { if (istemplatekind(ms_rac, "omit")) { return '0'B; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie1ccef090ad51e26ccae17998e4294c6e27cf9c8 Gerrit-Change-Number: 20105 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 13 08:04:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 13 Sep 2020 08:04:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Make L3 (SM/GMM) decoding a compile-time option References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20106 ) Change subject: BSSGP_Emulation: Make L3 (SM/GMM) decoding a compile-time option ...................................................................... BSSGP_Emulation: Make L3 (SM/GMM) decoding a compile-time option This allows us to build low-level tests that don't require all of L3. Change-Id: I7ef7e93e2cd1d37e7e4a62947ca8dfde30d93b95 --- R library/BSSGP_Emulation.ttcnpp M pcu/gen_links.sh M pcu/regen_makefile.sh M sgsn/gen_links.sh M sgsn/regen_makefile.sh 5 files changed, 48 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/20106/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcnpp similarity index 97% rename from library/BSSGP_Emulation.ttcn rename to library/BSSGP_Emulation.ttcnpp index e3023ed..05a730b 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcnpp @@ -18,8 +18,10 @@ import from Osmocom_Gb_Types all; import from IPL4asp_Types all; +#ifdef BSSGP_EM_L3 import from MobileL3_GMM_SM_Types all; import from MobileL3_Types all; +#endif import from LLC_Types all; import from LLC_Templates all; @@ -50,17 +52,25 @@ /* port from our (internal) point of view */ type port BSSGP_SP_PT message { in PDU_BSSGP, - PDU_LLC, + PDU_LLC +#ifdef BSSGP_EM_L3 + , PDU_L3_MS_SGSN, - PDU_L3_SGSN_MS; + PDU_L3_SGSN_MS +#endif + ; out PDU_BSSGP, PDU_LLC, PDU_SN, NsStatusIndication, BssgpStatusIndication, - ASP_Event, + ASP_Event +#ifdef BSSGP_EM_L3 + , PDU_L3_MS_SGSN, - PDU_L3_SGSN_MS; + PDU_L3_SGSN_MS +#endif + ; } with { extension "internal" }; /* port from the user point of view */ @@ -70,13 +80,21 @@ BssgpStatusIndication, PDU_BSSGP, PDU_LLC, - PDU_SN, + PDU_SN +#ifdef BSSGP_EM_L3 + , PDU_L3_MS_SGSN, - PDU_L3_SGSN_MS; + PDU_L3_SGSN_MS +#endif + ; out PDU_BSSGP, - PDU_LLC, + PDU_LLC +#ifdef BSSGP_EM_L3 + , PDU_L3_SGSN_MS, - PDU_L3_MS_SGSN; + PDU_L3_MS_SGSN +#endif + ; } with { extension "internal" }; signature BSSGP_register_client(hexstring imsi, OCT4 tlli, BssgpCellId cell_id); @@ -167,8 +185,11 @@ type enumerated BssgpDecodeDepth { BSSGP_DECODE_DEPTH_BSSGP, BSSGP_DECODE_DEPTH_LLC, - BSSGP_DECODE_DEPTH_SNDCP, + BSSGP_DECODE_DEPTH_SNDCP +#ifdef BSSGP_EM_L3 + , BSSGP_DECODE_DEPTH_L3 +#endif }; type record BssgpConfig { @@ -524,8 +545,10 @@ var NsUnitdataIndication udi; var PDU_BSSGP bs_pdu; var PDU_LLC llc; +#ifdef BSSGP_EM_L3 var PDU_L3_MS_SGSN l3_mo; var PDU_L3_SGSN_MS l3_mt; +#endif /* bogus unblock, just respond with ACK */ [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK(g_cfg.bvci), 0)) -> value udi { @@ -618,6 +641,7 @@ BSCP.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); } +#ifdef BSSGP_EM_L3 /* ConnHdlr sends L3: Encode and send as UL_UD / DL_UD */ [g_cfg.sgsn_role] BSSGP_SP.receive(PDU_L3_SGSN_MS:?) -> value l3_mt sender vc_conn { var integer idx := f_tbl_idx_by_comp(vc_conn); @@ -635,6 +659,7 @@ var octetstring llc_enc := enc_PDU_LLC(valueof(ts_LLC_UI(l3_enc, sapi, '1'B, n_u))); BSCP.send(f_BnsUdReq(ts_BSSGP_UL_UD(ClientTable[idx].tlli, ClientTable[idx].cell_id, llc_enc), g_cfg.bvci)); } +#endif /* ConnHdlr sends raw LLC: Encode and send as UL_UD / DL_UD */ [not g_cfg.sgsn_role] BSSGP_SP.receive(PDU_LLC:?) -> value llc sender vc_conn { @@ -656,6 +681,7 @@ return ret; } +#ifdef BSSGP_EM_L3 function f_llc_sapi_by_l3_mo(PDU_L3_MS_SGSN l3_mo) return BIT4 { if (ischosen(l3_mo.msgs.gprs_mm)) { return c_LLC_SAPI_LLGMM; @@ -679,6 +705,7 @@ setverdict(fail, "No LLC SAPI for ", l3_mt); mtc.stop; } +#endif @@ -698,8 +725,10 @@ type record BssgpDecoded { PDU_BSSGP bssgp, PDU_LLC llc optional, +#ifdef BSSGP_EM_L3 PDU_L3_MS_SGSN l3_mo optional, PDU_L3_SGSN_MS l3_mt optional, +#endif PDU_SN sndcp optional } @@ -708,8 +737,10 @@ var BssgpDecoded dec := { bssgp := bssgp, llc := omit, +#ifdef BSSGP_EM_L3 l3_mo := omit, l3_mt := omit, +#endif sndcp := omit }; @@ -729,6 +760,7 @@ } } +#ifdef BSSGP_EM_L3 /* Decode L3, if it is a LLC PDU containing L3 */ if (g_cfg.depth >= BSSGP_DECODE_DEPTH_L3) { if (isvalue(dec.llc) and match(dec.llc, tr_LLC_UI_L3)) { @@ -739,6 +771,7 @@ } } } +#endif return dec; } diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index 3a52c99..d834bd0 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -51,7 +51,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.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+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn " gen_links $DIR $FILES diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index 6fd000e..b2063ac 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh -FILES="*.ttcn BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc" +FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc" + +export CPPFLAGS_TTCN3="-DBSSGP_EM_L3" ../regen-makefile.sh PCU_Tests.ttcn $FILES diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 541670d..578b454 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -85,7 +85,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " FILES+="NS_Emulation.ttcn PCUIF_Types.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " -FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " +FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index a239a3b..1d1411e 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -2,7 +2,7 @@ FILES="*.ttcn *.ttcnpp *.asn BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc RANAP_EncDec.cc " -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DRAN_EMULATION_RANAP" +export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DRAN_EMULATION_RANAP -DBSSGP_EM_L3" ../regen-makefile.sh SGSN_Tests.ttcn $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7ef7e93e2cd1d37e7e4a62947ca8dfde30d93b95 Gerrit-Change-Number: 20106 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 13 08:18:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 13 Sep 2020 08:18:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: move some key types from GSM_RR_Types to GSM_Types In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20104 to look at the new patch set (#2). Change subject: move some key types from GSM_RR_Types to GSM_Types ...................................................................... move some key types from GSM_RR_Types to GSM_Types This in turn means Osmocom_Gb_Types doesn't need to depend on GSM_RR_Types anymore, which is particularly ugly as the latter now depends on RLCMAC_*, creating a long chain of dependencies. Change-Id: I8c8da7709695ff0023f71b3999291e2515b22e46 --- M library/GSM_RR_Types.ttcn M library/GSM_Types.ttcn M library/Osmocom_Gb_Types.ttcn M sgsn/SGSN_Tests.ttcn 4 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/20104/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c8da7709695ff0023f71b3999291e2515b22e46 Gerrit-Change-Number: 20104 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 18 20:35:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 18 Sep 2020 20:35:05 +0000 Subject: Change in libosmocore[master]: ns2: Improve/extend doxygen comments for new ns2 implementation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20208 ) Change subject: ns2: Improve/extend doxygen comments for new ns2 implementation ...................................................................... ns2: Improve/extend doxygen comments for new ns2 implementation I was reading through the code and noticed many functions not documented yet, or with incomplete documentation. Change that. Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf --- M src/gb/gprs_ns2.c 1 file changed, 108 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/20208/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 0fa7197..21a45a1 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -203,6 +203,11 @@ .class_id = OSMO_STATS_CLASS_PEER, }; +/*! string-format a given NS-VC into a user-supplied buffer. + * \param[in] buf user-allocated output buffer + * \param[in] buf_len size of user-allocated output buffer in bytes + * \param[in] nsvc NS-VC to be string-formatted + * \return pointer to buf on success; NULL on error */ char *gprs_ns2_ll_str_buf(char *buf, size_t buf_len, struct gprs_ns2_vc *nsvc) { struct osmo_sockaddr *local; @@ -256,12 +261,19 @@ /* udp is the longest: udp)[IP6]:65536<65536>[IP6]:65536 */ #define NS2_LL_MAX_STR 4+2*(INET6_ADDRSTRLEN+9)+8 +/*! string-format a given NS-VC to a thread-local static buffer. + * \param[in] nsvc NS-VC to be string-formatted + * \return pointer to the string on success; NULL on error */ const char *gprs_ns2_ll_str(struct gprs_ns2_vc *nsvc) { static __thread char buf[NS2_LL_MAX_STR]; return gprs_ns2_ll_str_buf(buf, sizeof(buf), nsvc); } +/*! string-format a given NS-VC to a dynamically allocated string. + * \param[in] ctx talloc context from which to allocate + * \param[in] nsvc NS-VC to be string-formatted + * \return pointer to the string on success; NULL on error */ char *gprs_ns2_ll_str_c(const void *ctx, struct gprs_ns2_vc *nsvc) { char *buf = talloc_size(ctx, NS2_LL_MAX_STR); @@ -270,12 +282,10 @@ return gprs_ns2_ll_str_buf(buf, NS2_LL_MAX_STR, nsvc); } -/*! - * Receive a primitive from the NS User (Gb) - * \param nsi - * \param oph The primitive. - * \return 0 on success - */ +/*! Receive a primitive from the NS User (Gb). + * \param[in] nsi NS instance to which the primitive is issued + * \param[in] oph The primitive + * \return 0 on success; negative on error */ int gprs_ns2_recv_prim(struct gprs_ns2_inst *nsi, struct osmo_prim_hdr *oph) { /* TODO: implement load distribution function */ @@ -329,6 +339,11 @@ return ns2_tx_unit_data(nsvc, bvci, sducontrol, oph->msg); } +/*! Send a STATUS.ind primitive to the specified NS instance user. + * \param[in] nsi NS instance on which we operate + * \param[in] nsei NSEI to which the statue relates + * \param[in] bvci BVCI to which the status relates + * \param[in] cause The cause of the status */ void ns2_prim_status_ind(struct gprs_ns2_inst *nsi, uint16_t nsei, uint16_t bvci, enum gprs_ns2_affecting_cause cause) @@ -343,13 +358,11 @@ nsi->cb(&nsp.oph, nsi->cb_data); } -/*! - * \brief ns2_vc_alloc - * \param bind - * \param nse - * \param initiater - if this is an incoming remote (!initiater) or a local outgoing connection (initater) - * \return - */ +/*! Allocate a NS-VC within the given bind + NSE. + * \param[in] bind The 'bind' on which we operate + * \param[in] nse The NS Entity on which we operate + * \param[in] initiater - if this is an incoming remote (!initiater) or a local outgoing connection (initater) + * \return newly allocated NS-VC on success; NULL on error */ struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_nse *nse, bool initiater) { struct gprs_ns2_vc *nsvc = talloc_zero(bind, struct gprs_ns2_vc); @@ -390,7 +403,8 @@ return NULL; } - +/*! Destroy/release given NS-VC. + * \param[in] nsvc NS-VC to destroy */ void gprs_ns2_free_nsvc(struct gprs_ns2_vc *nsvc) { if (!nsvc) @@ -419,6 +433,7 @@ talloc_free(nsvc); } +/*! Allocate a message buffer for use with the NS2 stack. */ struct msgb *gprs_ns2_msgb_alloc(void) { struct msgb *msg = msgb_alloc_headroom(NS_ALLOC_SIZE, NS_ALLOC_HEADROOM, @@ -430,14 +445,12 @@ return msg; } -/*! - * Create a status message to be sent over a new connection. - * \param[in] orig_msg the original message - * \param[in] tp TLVP parsed of the original message - * \param[out] reject - * \param[in] cause - * \return 0 on success - */ +/*! Create a status message to be sent over a new connection. + * \param[in] orig_msg the original message + * \param[in] tp TLVP parsed of the original message + * \param[out] reject callee-allocated message buffer of the generated NS-STATUS + * \param[in] cause Cause for the rejection + * \return 0 on success */ static int reject_status_msg(struct msgb *orig_msg, struct tlv_parsed *tp, struct msgb **reject, enum ns_cause cause) { struct msgb *msg = gprs_ns2_msgb_alloc(); @@ -492,6 +505,10 @@ return 0; } +/*! Resolve a NS Entity based on its NSEI. + * \param[in] nsi NS Instance in which we do the look-up + * \param[in] nsei NSEI to look up + * \return NS Entity in successful case; NULL if none found */ struct gprs_ns2_nse *gprs_ns2_nse_by_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei) { struct gprs_ns2_nse *nse; @@ -504,6 +521,10 @@ return NULL; } +/*! Resolve a NS-VC Entity based on its NS-VCI. + * \param[in] nsi NS Instance in which we do the look-up + * \param[in] nsvci NS-VCI to look up + * \return NS-VC Entity in successful case; NULL if none found */ struct gprs_ns2_vc *gprs_ns2_nsvc_by_nsvci(struct gprs_ns2_inst *nsi, uint16_t nsvci) { struct gprs_ns2_nse *nse; @@ -519,6 +540,10 @@ return NULL; } +/*! Create a NS Entity within given NS instance. + * \param[in] nsi NS instance in which to create NS Entity + * \param[in] nsei NS Entity Identifier of to-be-created NSE + * \returns newly-allocated NS-E in successful case; NULL on error */ struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei) { struct gprs_ns2_nse *nse; @@ -541,6 +566,8 @@ return nse; } +/*! Destroy given NS Entity. + * \param[in] nse NS Entity to destroy */ void gprs_ns2_free_nse(struct gprs_ns2_nse *nse) { struct gprs_ns2_vc *nsvc, *tmp; @@ -574,15 +601,13 @@ } -/*! - * Create a new VC based on a message. Depending on the bind it might create NSE. - * \param[in] bind - * \param[in] msg - * \param[in] logname A name to describe the VC. E.g. ip address pair - * \param[out] reject A message filled to be sent back. Only used in failure cases. - * \param[out] success A pointer which will be set to the new VC on success - * \return - */ +/*! Create a new NS-VC based on a [received] message. Depending on the bind it might create a NSE. + * \param[in] bind the bind through which msg was received + * \param[in] msg the actual received message + * \param[in] logname A name to describe the VC. E.g. ip address pair + * \param[out] reject A message filled to be sent back. Only used in failure cases. + * \param[out] success A pointer which will be set to the new VC on success + * \return enum value indicating the status, e.g. GPRS_NS2_CS_CREATED */ enum gprs_ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind, struct msgb *msg, const char *logname, @@ -696,6 +721,12 @@ return GPRS_NS2_CS_CREATED; } +/*! Create, and connect an inactive, new IP-based NS-VC + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nse NS Entity in which the NS-VC is to be created + * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET + * \return pointer to newly-allocated, connected and inactive NS-VC; NULL on error */ struct gprs_ns2_vc *gprs_ns2_ip_connect_inactive(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, struct gprs_ns2_nse *nse, @@ -715,14 +746,12 @@ return nsvc; } -/*! - * Create a new IP-based NSVC - * \param bind - * \param remote - * \param nse - * \param nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET - * \return - */ +/*! Create, connect and activate a new IP-based NS-VC + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nse NS Entity in which the NS-VC is to be created + * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET + * \return pointer to newly-allocated, connected and activated NS-VC; NULL on error */ struct gprs_ns2_vc *gprs_ns2_ip_connect(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, struct gprs_ns2_nse *nse, @@ -738,14 +767,12 @@ return nsvc; } -/*! - * Create a new IP-based NSVC - * \param bind - * \param remote - * \param nsei - * \param nsvci only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET - * \return - */ +/*! Create, connect and activate a new IP-based NS-VC + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nsei NSEI of the NS Entity in which the NS-VC is to be created + * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET + * \return pointer to newly-allocated, connected and activated NS-VC; NULL on error */ struct gprs_ns2_vc *gprs_ns2_ip_connect2(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, uint16_t nsei, @@ -762,13 +789,11 @@ return gprs_ns2_ip_connect(bind, remote, nse, nsvci); } -/*! - * Create a new IP SNS NSE - * \param bind - * \param remote - * \param nsei - * \return 0 on success - */ +/*! Create, connect and activate a new IP-SNS NSE. + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nsei NSEI of the NS Entity in which the NS-VC is to be created + * \return 0 on success; negative on error */ int gprs_ns2_ip_connect_sns(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, uint16_t nsei) @@ -795,6 +820,10 @@ return ns2_sns_bss_fsm_start(nse, nsvc, remote); } +/*! Find NS-VC for given socket address. + * \param[in] nse NS Entity in which to search + * \param[in] sockaddr socket address to search for + * \return NS-VC matching sockaddr; NULL if none found */ struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr(struct gprs_ns2_nse *nse, struct osmo_sockaddr *sockaddr) { @@ -814,13 +843,11 @@ } -/*! - * \brief gprs_ns2_recv_vc entrypoint of received NS PDU from the driver/bind - * \param nsi - * \param vc - * \param msg the received message. Must not be freeded. - * \return - */ +/*! Bottom-side entry-point for received NS PDU from the driver/bind + * \param[in] nsi NS instance + * \param[in] nsvc NS-VC for which the message was received + * \param msg the received message. Ownership is trasnferred, caller must not free it! + * \return 0 on success; negative on error */ int ns2_recv_vc(struct gprs_ns2_inst *nsi, struct gprs_ns2_vc *nsvc, struct msgb *msg) @@ -893,7 +920,9 @@ return rc; } -/* notify a nse about the change of a nsvc */ +/*! Notify a nse about the change of a NS-VC. + * \param[in] nsvc NS-VC which has detected the change (and shall not be notified). + * \param[in] unblocked whether the NSE should be marked as unblocked (true) or blocked (false) */ void ns2_nse_notify_unblocked(struct gprs_ns2_vc *nsvc, bool unblocked) { struct gprs_ns2_nse *nse = nsvc->nse; @@ -928,11 +957,10 @@ } /*! Create a new GPRS NS instance - * \param[in] ctx a talloc context - * \param[in] cb Call-back function for incoming BSSGP data - * \param[in] cb_data Call-back data - * \returns dynamically allocated gprs_ns_inst - */ + * \param[in] ctx a talloc context to allocate NS instance from + * \param[in] cb Call-back function for dispatching primitives to the user + * \param[in] cb_data transparent user data passed to Call-back + * \returns dynamically allocated gprs_ns_inst; NULL on error */ struct gprs_ns2_inst *gprs_ns2_instantiate(void *ctx, osmo_prim_cb cb, void *cb_data) { struct gprs_ns2_inst *nsi; @@ -958,6 +986,8 @@ return nsi; } +/*! Destroy a NS Instance (including all its NSEs, binds, ...). + * \param[in] nsi NS instance to destroy */ void gprs_ns2_free(struct gprs_ns2_inst *nsi) { struct gprs_ns2_vc_bind *bind, *tbind; @@ -975,11 +1005,10 @@ } } -/*! - * \brief gprs_ns2_dynamic_create_nse - * \param nsi the instance to modify - * \param create_nse if NSE can be created on receiving package. SGSN set this. - * \return +/*! Configure whether a NS Instance should dynamically create NSEs based on incoming traffic. + * \param nsi the instance to modify + * \param create_nse if NSE can be created on receiving package. SGSN set this. + * \return 0 on success; negative on error */ int gprs_ns2_dynamic_create_nse(struct gprs_ns2_inst *nsi, bool create_nse) { @@ -988,6 +1017,8 @@ return 0; } +/*! Start the NS-ALIVE FSM in all NS-VCs of given NSE. + * \param[in] nse NS Entity in whihc to start NS-ALIVE FSMs */ void gprs_ns2_start_alive_all_nsvcs(struct gprs_ns2_nse *nse) { struct gprs_ns2_vc *nsvc; @@ -1001,11 +1032,16 @@ } } +/*! Set the mode of given bind. + * \param[in] bind the bind we want to set the mode of + * \param[in] modde mode to set bind to */ void gprs_ns2_bind_set_mode(struct gprs_ns2_vc_bind *bind, enum gprs_ns2_vc_mode mode) { bind->vc_mode = mode; } +/*! Destroy a given bind. + * \param[in] bind the bind we want to destroy */ void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind) { struct gprs_ns2_vc *nsvc, *tmp; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf Gerrit-Change-Number: 20208 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 18 20:35:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 18 Sep 2020 20:35:05 +0000 Subject: Change in libosmocore[master]: ns2: Use NULL and not '0' when returning a NULL-Pointer References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20209 ) Change subject: ns2: Use NULL and not '0' when returning a NULL-Pointer ...................................................................... ns2: Use NULL and not '0' when returning a NULL-Pointer Change-Id: I9458e6dcf8133fbcfbc89437e58aad049a6d432b --- M src/gb/gprs_ns2.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/20209/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 21a45a1..57a08d1 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -216,7 +216,7 @@ struct osmo_sockaddr_str remote_str; if (!buf_len) - return 0; + return NULL; switch (nsvc->ll) { case GPRS_NS_LL_UDP: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9458e6dcf8133fbcfbc89437e58aad049a6d432b Gerrit-Change-Number: 20209 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 18 01:30:55 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 18 Sep 2020 01:30:55 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f640ddf387b2_61f2b0a440665fc30447b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 104s] for (unsigned i = 0; i < gss->num_ip6_remote; i++) { [ 104s] ^ [ 104s] gprs_ns2_sns.c: In function 'ns2_sns_st_configured_change': [ 104s] gprs_ns2_sns.c:1053:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 104s] for (int i = 0; i < num_v4; i++) { [ 104s] ^ [ 104s] gprs_ns2_sns.c:1067:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 104s] for (int i = 0; i < num_v6; i++) { [ 104s] ^ [ 104s] Makefile:535: recipe for target 'gprs_ns2_sns.lo' failed [ 104s] make[3]: *** [gprs_ns2_sns.lo] Error 1 [ 104s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/gb' [ 104s] Makefile:687: recipe for target 'all-recursive' failed [ 104s] make[2]: *** [all-recursive] Error 1 [ 104s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 104s] Makefile:465: recipe for target 'all' failed [ 104s] make[1]: *** [all] Error 2 [ 104s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 104s] dh_auto_build: make -j1 returned exit code 2 [ 104s] debian/rules:15: recipe for target 'build' failed [ 104s] make: *** [build] Error 2 [ 104s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 104s] ### VM INTERACTION START ### [ 105s] Powering off. [ 105s] [ 101.622193] reboot: Power down [ 105s] ### VM INTERACTION END ### [ 105s] [ 105s] goat17 failed "build libosmocore_1.4.0.55.48f6.dsc" at Fri Sep 18 01:30:44 UTC 2020. [ 105s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 18 01:37:29 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 18 Sep 2020 01:37:29 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f640f675d045_61f2b0a440665fc30553d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 152s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 152s] [COMPILING libboard/qmod/source/card_pres.c] [ 152s] [COMPILING libboard/qmod/source/wwan_led.c] [ 152s] [COMPILING libboard/qmod/source/i2c.c] [ 152s] [COMPILING libboard/qmod/source/board_qmod.c] [ 153s] [COMPILING apps/dfu/main.c] [ 153s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 153s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 153s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 153s] Memory region Used Size Region Size %age Used [ 153s] rom: 16588 B 16 KB 101.25% [ 153s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 153s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 153s] collect2: error: ld returned 1 exit status [ 153s] % [ 153s] make[2]: *** [Makefile:234: flash] Error 1 [ 153s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 153s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 153s] dh_auto_build: error: make -j1 returned exit code 2 [ 153s] make: *** [debian/rules:16: build] Error 25 [ 153s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 154s] ### VM INTERACTION START ### [ 157s] [ 144.027665] sysrq: Power Off [ 157s] [ 144.032432] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] cloud130 failed "build simtrace2_0.7.0.63.39070.dsc" at Fri Sep 18 01:37:14 UTC 2020. [ 157s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Sep 18 01:35:29 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 18 Sep 2020 01:35:29 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f640eeda588b_61f2b0a440665fc3051f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 198s] for (unsigned i = 0; i < gss->num_ip6_remote; i++) { [ 198s] ^ [ 198s] gprs_ns2_sns.c: In function 'ns2_sns_st_configured_change': [ 198s] gprs_ns2_sns.c:1053:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 198s] for (int i = 0; i < num_v4; i++) { [ 198s] ^ [ 198s] gprs_ns2_sns.c:1067:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 198s] for (int i = 0; i < num_v6; i++) { [ 198s] ^ [ 198s] Makefile:535: recipe for target 'gprs_ns2_sns.lo' failed [ 198s] make[3]: *** [gprs_ns2_sns.lo] Error 1 [ 198s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/gb' [ 198s] Makefile:687: recipe for target 'all-recursive' failed [ 198s] make[2]: *** [all-recursive] Error 1 [ 198s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 198s] Makefile:465: recipe for target 'all' failed [ 198s] make[1]: *** [all] Error 2 [ 198s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 198s] dh_auto_build: make -j1 returned exit code 2 [ 198s] debian/rules:15: recipe for target 'build' failed [ 198s] make: *** [build] Error 2 [ 198s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 198s] ### VM INTERACTION START ### [ 199s] Powering off. [ 199s] [ 190.042896] reboot: Power down [ 199s] ### VM INTERACTION END ### [ 199s] [ 199s] cloud127 failed "build libosmocore_1.4.0.55.48f6.dsc" at Fri Sep 18 01:35:22 UTC 2020. [ 199s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Sep 18 21:14:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 18 Sep 2020 21:14:41 +0000 Subject: Change in libosmocore[master]: ns2: Improve/extend doxygen comments for new ns2 implementation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20208 to look at the new patch set (#2). Change subject: ns2: Improve/extend doxygen comments for new ns2 implementation ...................................................................... ns2: Improve/extend doxygen comments for new ns2 implementation I was reading through the code and noticed many functions not documented yet, or with incomplete documentation. Change that. Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_message.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vc_fsm.c 6 files changed, 197 insertions(+), 126 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/20208/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf Gerrit-Change-Number: 20208 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 18 21:14:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 18 Sep 2020 21:14:42 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Mark gprs_ns2_validate_* as static References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20210 ) Change subject: gprs_ns2: Mark gprs_ns2_validate_* as static ...................................................................... gprs_ns2: Mark gprs_ns2_validate_* as static They are all called indirectly via gprs_ns2_validate(), so mark them as static. Change-Id: I8425ed3da32019b86cf12d3c27132f07d931cf27 --- M src/gb/gprs_ns2_message.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/20210/1 diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index b4063f5..fac6108 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -64,7 +64,7 @@ -int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_CAUSE) || !TLVP_PRESENT(tp, NS_IE_VCI) || !TLVP_PRESENT(tp, NS_IE_NSEI)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -74,7 +74,7 @@ return 0; } -int gprs_ns2_validate_reset_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_reset_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_VCI) || !TLVP_PRESENT(tp, NS_IE_NSEI)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -84,7 +84,7 @@ return 0; } -int gprs_ns2_validate_block(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_block(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_VCI) || !TLVP_PRESENT(tp, NS_IE_CAUSE)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -94,7 +94,7 @@ return 0; } -int gprs_ns2_validate_block_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_block_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_VCI)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -104,7 +104,7 @@ return 0; } -int gprs_ns2_validate_status(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_status(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_CAUSE)) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8425ed3da32019b86cf12d3c27132f07d931cf27 Gerrit-Change-Number: 20210 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 18 22:36:15 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Fri, 18 Sep 2020 22:36:15 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Allow configuring ack initiation behavior In-Reply-To: References: Message-ID: matt9j has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 ) Change subject: ipa_proto: Allow configuring ack initiation behavior ...................................................................... Patch Set 2: > Patch Set 2: > > > Patch Set 2: > > > > > adding neels here as he might know why osmo-msc behaves strangely. In either case, I'm happy to merge a work-around here. > > > > osmo-msc <-> osmo-hlr speaks GSUP/IPA. > > osmo-msc initializes this via osmo_gsup_client_create2(), from libosmo-gsup-client installed by osmo-hlr.git. > > That gsup client code calls ipa_client_conn_create2(), and I see nothing out of the ordinary. > > Neither osmo-msc nor osmo-hlr source trees contain IPAC_MSGT_ID_RESP or _ACK. > > > > So I assume if osmo-msc speaks weird IPA, then all our programs using ipa_client should behave just as weirdly. > > The original IPA CCM handshake as we know it from nanoBTS (I just checked my pcap files from a decade ago) goes like this: > > BTS -> BSC: TCP connect > BTS <- BSC: ID REQ > BTS -> BSC: ID ACK > BTS -> BSC: ID RESP > BSC <- BTS: ID ACK > ... > now we get OML traffic. > > I also ahve seen the following > > BTS -> BSC: TCP connect > BTS -> BSC: ID ACK > BTS <- BSC: ID REQ > BTS -> BSC: ID RESP > BTS <- BSC: ID ACK > > which seems to indicate that the BSC was a bit slow in sending the ID REQ, and that the BTS was faster sending that BTS-originated "ACK". > > I guess the important part is > * ID_REQ is responded to with ID_RESP > * once the client has received an ID ACK, it proceeds with the higher-level protocol. Ah, interesting. I think I understand what is going on now. It looks like there actually may be some weirdness with the HLR, not the MSC. If below is not intended behavior, I am happy to open up a ticket. In the osmocom docs for the IPA spec (I think the latest is here? https://ftp.osmocom.org/docs/latest/osmobts-abis.pdf ...if I'm looking at an old version that would explain things too) there is no mention of the bts originated ack in the ccm section (3.3). In my trace of the msc it looks like the ack comes after the response, but that could just be a timing issue. The existing code in the erlang module sends an ID_REQ from the BTS to the HLR on socket connect, and the HLR never responds, but also seems to not proceed to the higher-level protocol. HLR -> dia2gsup: ID_REQ dia2gsup -> HLR: ID_REQ (unconditional, see ipa_proto:unblock/1) dia2gsup -> HLR: ID_RESP [no app traffic, no HLR ack] With this hack, the trace becomes: HLR -> dia2gsup: ID_REQ dia2gsup -> HLR: ID_REQ (unconditional, see ipa_proto:unblock/1) dia2gsup -> HLR: ID_RESP dia2gsup -> HLR: ID_ACK (hacked always after ID_RESP) HLR -> dia2gsup: ID_ACK [App traffic! Joy!] If I instead have dia2gsup send ID_ACK on startup, and disable the hack, we get stuck in an ack loop: HLR -> dia2gsup: ID_REQ dia2gsup -> HLR: ID_ACK HLR -> dia2gsup: ID_ACK dia2gsup -> HLR: ID_RESP dia2gsup -> HLR: ID_ACK HLR -> dia2gsup: ID_ACK dia2gsup -> HLR: ID_ACK HLR -> dia2gsup: ID_ACK dia2gsup -> HLR: ID_ACK HLR -> dia2gsup: ID_ACK dia2gsup -> HLR: ID_ACK HLR -> dia2gsup: ID_ACK ... Finally, if I do half and half... with dia2gsup sending an initial ack, but not responding to acks, I get a successful start HLR -> dia2gsup: ID_REQ dia2gsup -> HLR: ID_ACK HLR -> dia2gsup: ID_ACK dia2gsup -> HLR: ID_RESP [App traffic! Joy!] I will update this change to do this last behavior, with configuration to determine if it initiates with an ack and then does not re-ack, or initiates with a request and then does re-ack. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e Gerrit-Change-Number: 20019 Gerrit-PatchSet: 2 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 18 Sep 2020 22:36:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 18 23:48:39 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 18 Sep 2020 23:48:39 +0000 Subject: Change in osmo-sgsn[master]: gmm: on invalid RA id reject the MS with an implicit detach In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20194 ) Change subject: gmm: on invalid RA id reject the MS with an implicit detach ...................................................................... Patch Set 2: It does for me ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6a0b335d51f58c26349f7e0a62b2107d7d351d07 Gerrit-Change-Number: 20194 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 18 Sep 2020 23:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 19 00:46:24 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Sat, 19 Sep 2020 00:46:24 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Allow configuring ack initiation behavior In-Reply-To: References: Message-ID: Hello fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 to look at the new patch set (#3). Change subject: ipa_proto: Allow configuring ack initiation behavior ...................................................................... ipa_proto: Allow configuring ack initiation behavior When the osmo-msc version 1.6.1 connects to the osmo-hlr, it sends an id response and an immediate ack. This commit allows initiating the handshake with an ack rather than an id request (as is done by ipa *clients*, like a bts towards a bsc, or the msc towards the hlr) if needed to mimic behavior of particular components. Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e --- M include/ipa.hrl M src/ipa_proto.erl 2 files changed, 26 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/19/20019/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e Gerrit-Change-Number: 20019 Gerrit-PatchSet: 3 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 19 00:46:25 2020 From: gerrit-no-reply at lists.osmocom.org (matt9j) Date: Sat, 19 Sep 2020 00:46:25 +0000 Subject: Change in ...osmo_ss7[master]: ebin/app: Add missing ipa_proto_ccm module References: Message-ID: matt9j has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20211 ) Change subject: ebin/app: Add missing ipa_proto_ccm module ...................................................................... ebin/app: Add missing ipa_proto_ccm module Commit 0c40c626caa95fd27be5f6af9b0b9f63edb23bb2 introduced a new ipa_proto_ccm module, which was not added to the app module list. Commit 515aa3343442e784602e23890672e40eb320aa00 then used a function from this module. In interactive mode the module would be loaded automatically so its omission was not detected in testing. In embedded mode (used by default in relx releases) modules are loaded statically on startup and must be explicitly listed. Change-Id: I5b7338341a9e179b41b8f2f092efe9aaf83451bb --- M ebin/osmo_ss7.app 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/11/20211/1 diff --git a/ebin/osmo_ss7.app b/ebin/osmo_ss7.app index 6eeceb2..be92ae3 100644 --- a/ebin/osmo_ss7.app +++ b/ebin/osmo_ss7.app @@ -3,6 +3,7 @@ {vsn, "1"}, {modules, [ osmo_util, ipa_proto, + ipa_proto_ccm, sctp_core, bssmap_codec, isup_codec, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I5b7338341a9e179b41b8f2f092efe9aaf83451bb Gerrit-Change-Number: 20211 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Sep 19 01:44:15 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 19 Sep 2020 01:44:15 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f6562833e6fa_61f2b0a440665fc658871@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 305s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 305s] [COMPILING libboard/qmod/source/card_pres.c] [ 305s] [COMPILING libboard/qmod/source/wwan_led.c] [ 305s] [COMPILING libboard/qmod/source/i2c.c] [ 306s] [COMPILING libboard/qmod/source/board_qmod.c] [ 306s] [COMPILING apps/dfu/main.c] [ 306s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 306s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 306s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 306s] Memory region Used Size Region Size %age Used [ 306s] rom: 16588 B 16 KB 101.25% [ 306s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 306s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 306s] collect2: error: ld returned 1 exit status [ 306s] % [ 306s] make[2]: *** [Makefile:234: flash] Error 1 [ 306s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 306s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 306s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 306s] dh_auto_build: error: make -j1 returned exit code 2 [ 306s] make: *** [debian/rules:16: build] Error 25 [ 306s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 306s] ### VM INTERACTION START ### [ 310s] [ 285.364511] sysrq: Power Off [ 310s] [ 285.371275] reboot: Power down [ 310s] ### VM INTERACTION END ### [ 310s] [ 310s] lamb26 failed "build simtrace2_0.7.0.63.39070.dsc" at Sat Sep 19 01:43:49 UTC 2020. [ 310s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Sep 19 03:27:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Sat, 19 Sep 2020 03:27:28 +0000 Subject: Change in osmo-trx[master]: arch: x86: Fix convolve optimizations breaking signal In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20205 ) Change subject: arch: x86: Fix convolve optimizations breaking signal ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I98ad885a5d71e7775973a4d881c0f1cd665ea711 Gerrit-Change-Number: 20205 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 19 Sep 2020 03:27:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 19 03:27:40 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Sat, 19 Sep 2020 03:27:40 +0000 Subject: Change in osmo-trx[master]: arch: x86: Fix convolve optimizations breaking signal In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20205 ) Change subject: arch: x86: Fix convolve optimizations breaking signal ...................................................................... arch: x86: Fix convolve optimizations breaking signal This patch fixes MS failing to even see the network, and only RACHs of 1 zeroed byte being seen in GSMTAP. The issue seems to only appear on some specific machines; others have been running fine for weeks without this memset being an issue. Fixes: 7a52e42ee0676f47e801dd348b478302de5d2e50 Change-Id: I98ad885a5d71e7775973a4d881c0f1cd665ea711 --- M Transceiver52M/arch/x86/convolve.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/arch/x86/convolve.c b/Transceiver52M/arch/x86/convolve.c index 81ea782..be62721 100644 --- a/Transceiver52M/arch/x86/convolve.c +++ b/Transceiver52M/arch/x86/convolve.c @@ -102,9 +102,9 @@ #ifndef __OPTIMIZE__ if (bounds_check(x_len, h_len, y_len, start, len) < 0) return -1; - - memset(y, 0, len * 2 * sizeof(float)); #endif + memset(y, 0, len * 2 * sizeof(float)); + switch (h_len) { case 4: c.conv_real4(x, x_len, h, h_len, y, y_len, start, len); @@ -142,9 +142,9 @@ #ifndef __OPTIMIZE__ if (bounds_check(x_len, h_len, y_len, start, len) < 0) return -1; - - memset(y, 0, len * 2 * sizeof(float)); #endif + memset(y, 0, len * 2 * sizeof(float)); + if (!(h_len % 8)) c.conv_cmplx_8n(x, x_len, h, h_len, y, y_len, start, len); else if (!(h_len % 4)) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I98ad885a5d71e7775973a4d881c0f1cd665ea711 Gerrit-Change-Number: 20205 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 19 14:38:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 19 Sep 2020 14:38:18 +0000 Subject: Change in libosmocore[master]: ns2: Improve/extend doxygen comments for new ns2 implementation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20208 ) Change subject: ns2: Improve/extend doxygen comments for new ns2 implementation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf Gerrit-Change-Number: 20208 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 19 Sep 2020 14:38:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 19 14:38:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 19 Sep 2020 14:38:34 +0000 Subject: Change in libosmocore[master]: ns2: Use NULL and not '0' when returning a NULL-Pointer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20209 ) Change subject: ns2: Use NULL and not '0' when returning a NULL-Pointer ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9458e6dcf8133fbcfbc89437e58aad049a6d432b Gerrit-Change-Number: 20209 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 19 Sep 2020 14:38:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 19 14:38:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 19 Sep 2020 14:38:52 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Mark gprs_ns2_validate_* as static In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20210 ) Change subject: gprs_ns2: Mark gprs_ns2_validate_* as static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8425ed3da32019b86cf12d3c27132f07d931cf27 Gerrit-Change-Number: 20210 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 19 Sep 2020 14:38:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 06:23:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 06:23:29 +0000 Subject: Change in libosmocore[master]: ipaccess.h: Add more enum values and 'official' names In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20197 ) Change subject: ipaccess.h: Add more enum values and 'official' names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1f2b32c72d162f31b422293d2a361d528443f01 Gerrit-Change-Number: 20197 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 20 Sep 2020 06:23:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 06:33:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 06:33:01 +0000 Subject: Change in libosmocore[master]: ns2: Improve/extend doxygen comments for new ns2 implementation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20208 ) Change subject: ns2: Improve/extend doxygen comments for new ns2 implementation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf Gerrit-Change-Number: 20208 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 06:33:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 06:33:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 06:33:14 +0000 Subject: Change in libosmocore[master]: ns2: Use NULL and not '0' when returning a NULL-Pointer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20209 ) Change subject: ns2: Use NULL and not '0' when returning a NULL-Pointer ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9458e6dcf8133fbcfbc89437e58aad049a6d432b Gerrit-Change-Number: 20209 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 06:33:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 06:33:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 06:33:52 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Mark gprs_ns2_validate_* as static In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20210 ) Change subject: gprs_ns2: Mark gprs_ns2_validate_* as static ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8425ed3da32019b86cf12d3c27132f07d931cf27 Gerrit-Change-Number: 20210 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 06:33:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 06:35:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 06:35:15 +0000 Subject: Change in osmo-ci[master]: jobs: Enable --without-sse build variant for osmo-trx In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20207 ) Change subject: jobs: Enable --without-sse build variant for osmo-trx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47a2067dc25335557dfa93f291f6ca9cd4959735 Gerrit-Change-Number: 20207 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 06:35:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Sep 20 06:51:30 2020 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 20 Sep 2020 06:51:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-simtrace2_=C2=BB_a1=3Ddefault,a2?= =?UTF-8?Q?=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#932?= Message-ID: <1836422584.2219.1600584690707@jenkins.osmocom.org> See Changes: ------------------------------------------ [...truncated 1.55 KB...] at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/simtrace2" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2430) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2360) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2356) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1916) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1928) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1542) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor33.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:931) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:905) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:857) at hudson.remoting.UserRequest.perform(UserRequest.java:211) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Suppressed: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1788) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:356) at hudson.remoting.Channel.call(Channel.java:998) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:285) at com.sun.proxy.$Proxy56.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:299) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:897) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds No credentials specified > 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/simtrace2 # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/simtrace2 at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:909) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/simtrace2" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2430) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2360) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2356) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1916) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1928) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1542) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor33.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:931) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:905) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:857) at hudson.remoting.UserRequest.perform(UserRequest.java:211) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Suppressed: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1788) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:356) at hudson.remoting.Channel.call(Channel.java:998) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:285) at com.sun.proxy.$Proxy56.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:299) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:897) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds No credentials specified > 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/simtrace2 # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/simtrace2 at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:909) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/simtrace2" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2430) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2360) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2356) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1916) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1928) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1542) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor33.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:931) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:905) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:857) at hudson.remoting.UserRequest.perform(UserRequest.java:211) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Suppressed: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1788) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:356) at hudson.remoting.Channel.call(Channel.java:998) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:285) at com.sun.proxy.$Proxy56.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:299) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:897) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds No credentials specified > 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/simtrace2 # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/simtrace2 at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:909) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/simtrace2" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2430) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2360) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2356) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1916) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1928) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1542) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor33.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:931) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:905) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:857) at hudson.remoting.UserRequest.perform(UserRequest.java:211) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Suppressed: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1788) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:356) at hudson.remoting.Channel.call(Channel.java:998) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:285) at com.sun.proxy.$Proxy56.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:299) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:897) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1131) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1167) at hudson.scm.SCM.checkout(SCM.java:505) at hudson.model.AbstractProject.checkout(AbstractProject.java:1206) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1880) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:428) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Sep 20 06:58:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 06:58:31 +0000 Subject: Change in pysim[master]: pySim-read.py: decode contents of EF.AD (Administrative data) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/19409 ) Change subject: pySim-read.py: decode contents of EF.AD (Administrative data) ...................................................................... Patch Set 6: Code-Review+1 Re-applying Code-Review+1 by Harald. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/19409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I938667bdf99d238eefac205d6dd70db1d714d842 Gerrit-Change-Number: 19409 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 06:58:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 06:58:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 06:58:36 +0000 Subject: Change in pysim[master]: pySim-read.py: decode contents of EF.AD (Administrative data) In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/19409 ) Change subject: pySim-read.py: decode contents of EF.AD (Administrative data) ...................................................................... pySim-read.py: decode contents of EF.AD (Administrative data) Change-Id: I938667bdf99d238eefac205d6dd70db1d714d842 --- M pySim-read.py M pySim/ts_51_011.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 8 files changed, 39 insertions(+), 9 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve herlesupreeth: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-read.py b/pySim-read.py index d6674a5..2ca0557 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -28,7 +28,7 @@ import random import re import sys -from pySim.ts_51_011 import EF, DF, EF_SST_map +from pySim.ts_51_011 import EF, DF, EF_SST_map, EF_AD_mode_map from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map from pySim.ts_31_103 import EF_IST_map @@ -225,7 +225,15 @@ # EF.AD (res, sw) = card.read_binary('AD') if sw == '9000': - print("AD: %s" % (res,)) + print("Administrative data: %s" % (res,)) + if res[:2] in EF_AD_mode_map: + print("\tMS operation mode: %s" % (EF_AD_mode_map[res[:2]],)) + else: + print("\tMS operation mode: (unknown 0x%s)" % (res[:2],)) + if int(res[4:6], 16) & 0x01: + print("\tCiphering Indicator: enabled") + else: + print("\tCiphering Indicator: disabled") else: print("AD: Can't read, response code = %s" % (sw,)) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 37d2bc8..8b73f02 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -313,4 +313,14 @@ 57: 'Multimedia Messaging Service (MMS)', 58: 'Extension 8', 59: 'MMS User Connectivity Parameters', -} \ No newline at end of file +} + +# 10.3.18 "EF.AD (Administrative data) " +EF_AD_mode_map = { + '00' : 'normal operation', + '80' : 'type approval operations', + '01' : 'normal operation + specific facilities', + '81' : 'type approval operations + specific facilities', + '02' : 'maintenance (off line)', + '04' : 'cell test operation', +} diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok index dcdd43c..6dd839c 100644 --- a/pysim-testdata/Fairwaves-SIM.ok +++ b/pysim-testdata/Fairwaves-SIM.ok @@ -42,7 +42,9 @@ ACC: 0008 MSISDN: Not available -AD: 00000002 +Administrative data: 00000002 + MS operation mode: normal operation + Ciphering Indicator: disabled SIM Service Table: ff3cc3ff030fff0f000fff03f0c0 Service 1 - CHV1 disable function Service 2 - Abbreviated Dialling Numbers (ADN) diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok index 0e41ec0..010a228 100644 --- a/pysim-testdata/Wavemobile-SIM.ok +++ b/pysim-testdata/Wavemobile-SIM.ok @@ -49,7 +49,9 @@ HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 6a82. ACC: abce MSISDN: Not available -AD: 00ffff02 +Administrative data: 00ffff02 + MS operation mode: normal operation + Ciphering Indicator: enabled SIM Service Table: ff33ff0f3c00ff0f000cf0c0f0030000 Service 1 - CHV1 disable function Service 2 - Abbreviated Dialling Numbers (ADN) diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok index 7ac9e2a..1d1714f 100644 --- a/pysim-testdata/fakemagicsim.ok +++ b/pysim-testdata/fakemagicsim.ok @@ -16,7 +16,9 @@ HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. ACC: ffff MSISDN: Not available -AD: 000000 +Administrative data: 000000 + MS operation mode: normal operation + Ciphering Indicator: disabled SIM Service Table: ff3fff0f0300f003000c Service 1 - CHV1 disable function Service 2 - Abbreviated Dialling Numbers (ADN) diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index 82176c6..947cff6 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -54,7 +54,9 @@ ACC: 0200 MSISDN: Not available -AD: 00000002 +Administrative data: 00000002 + MS operation mode: normal operation + Ciphering Indicator: disabled SIM Service Table: ff33ffff3f003f0f300cf0c3f00000 Service 1 - CHV1 disable function Service 2 - Abbreviated Dialling Numbers (ADN) diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index 55c43ad..da1a1f6 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -54,7 +54,9 @@ ACC: 0008 MSISDN (NPI=1 ToN=1): +77776336143 -AD: 00000002 +Administrative data: 00000002 + MS operation mode: normal operation + Ciphering Indicator: disabled SIM Service Table: ff3fffff3f003f1ff00c00c0f00000 Service 1 - CHV1 disable function Service 2 - Abbreviated Dialling Numbers (ADN) diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index 684fda7..f4b09c8 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -16,7 +16,9 @@ HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. ACC: 0008 MSISDN: Not available -AD: 000000 +Administrative data: 000000 + MS operation mode: normal operation + Ciphering Indicator: disabled SIM Service Table: ff3fff0f0f0000030000 Service 1 - CHV1 disable function Service 2 - Abbreviated Dialling Numbers (ADN) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/19409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I938667bdf99d238eefac205d6dd70db1d714d842 Gerrit-Change-Number: 19409 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Sep 20 09:04:58 2020 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 20 Sep 2020 09:04:58 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-simtrace2_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#933?= In-Reply-To: <1836422584.2219.1600584690707@jenkins.osmocom.org> References: <1836422584.2219.1600584690707@jenkins.osmocom.org> Message-ID: <1431714482.18.1600592698990@jenkins.osmocom.org> See From admin at opensuse.org Sun Sep 20 09:15:54 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 20 Sep 2020 09:15:54 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f671dcf7079f_61f2b0a440665fc95925d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 156s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 156s] [COMPILING libboard/qmod/source/card_pres.c] [ 156s] [COMPILING libboard/qmod/source/wwan_led.c] [ 156s] [COMPILING libboard/qmod/source/i2c.c] [ 156s] [COMPILING libboard/qmod/source/board_qmod.c] [ 156s] [COMPILING apps/dfu/main.c] [ 156s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 156s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 157s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 157s] Memory region Used Size Region Size %age Used [ 157s] rom: 16588 B 16 KB 101.25% [ 157s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 157s] collect2: error: ld returned 1 exit status [ 157s] % [ 157s] make[2]: *** [Makefile:234: flash] Error 1 [ 157s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 157s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 157s] dh_auto_build: error: make -j1 returned exit code 2 [ 157s] make: *** [debian/rules:16: build] Error 25 [ 157s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 157s] ### VM INTERACTION START ### [ 160s] [ 151.152423] sysrq: Power Off [ 160s] [ 151.157797] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] lamb54 failed "build simtrace2_0.7.0.63.39070.dsc" at Sun Sep 20 09:15:37 UTC 2020. [ 160s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:34:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:34:24 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Allow configuring ack initiation behavior In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 ) Change subject: ipa_proto: Allow configuring ack initiation behavior ...................................................................... Patch Set 3: Please note we never saw any real specification for the IPA CCM protocol. We just implemented it based on what we understood by looking at protocol traces. > > The original IPA CCM handshake as we know it from nanoBTS (I just checked my pcap files from a decade ago) goes like this: > > > > BTS -> BSC: TCP connect > > BTS <- BSC: ID REQ > > BTS -> BSC: ID ACK > > BTS -> BSC: ID RESP > > BSC <- BTS: ID ACK > > ... > > now we get OML traffic. > > > > I also ahve seen the following > > > > BTS -> BSC: TCP connect > > BTS -> BSC: ID ACK > > BTS <- BSC: ID REQ > > BTS -> BSC: ID RESP > > BTS <- BSC: ID ACK > > > > which seems to indicate that the BSC was a bit slow in sending the ID REQ, and that the BTS was faster sending that BTS-originated "ACK". > > > > I guess the important part is > > * ID_REQ is responded to with ID_RESP > > * once the client has received an ID ACK, it proceeds with the higher-level protocol. > > In the osmocom docs for the IPA spec (I think the latest is here? https://ftp.osmocom.org/docs/latest/osmobts-abis.pdf ...if I'm looking at an old version that would explain things too) there is no mention of the bts originated ack in the ccm section (3.3). feel free to submit a related update > In my trace of the msc it looks like the ack comes after the response, but that could just be a timing issue. We don't really know what is the correct way :/ > The existing code in the erlang module sends an ID_REQ from the BTS to the HLR on socket connect, and the HLR never responds, but also seems to not proceed to the higher-level protocol. You mean it send an ID_RQ from the MSC/MME/dia2gsup to the HLR? This is certainly wrong. The ID_REQ is sent from the (TCP) server to the (TCP) client, as the server needs to identify who the client is. In GSUP, the HLR is the server and everything else is a client. It may very well be the case that the Erlang IPA implementation was first written for a server use case and I later used it without checking for the client side in GSUP. > HLR -> dia2gsup: ID_REQ correct > dia2gsup -> HLR: ID_REQ (unconditional, see ipa_proto:unblock/1) incorrect > dia2gsup -> HLR: ID_RESP correct > [no app traffic, no HLR ack] no ACK in either way > With this hack, the trace becomes: > HLR -> dia2gsup: ID_REQ correct > dia2gsup -> HLR: ID_REQ (unconditional, see ipa_proto:unblock/1) still incorrect > dia2gsup -> HLR: ID_RESP correct > dia2gsup -> HLR: ID_ACK (hacked always after ID_RESP) > HLR -> dia2gsup: ID_ACK those two lok good to me. I don' think it matters much when they happen, but it always seemed logical to me to have the ACK phase after the REQ/RESP phase. > If I instead have dia2gsup send ID_ACK on startup, and disable the hack, we get stuck in an ack loop: I think this is again a result of the fact that the erlang IPA implementation wants to be the server, but actually is used as a client here. I don't recall the code, but if this distinction is not there, please feel free to add some kind of flag that tells it whcih role it is to assume. > Finally, if I do half and half... with dia2gsup sending an initial ack, but not responding to acks, I get a successful start > > HLR -> dia2gsup: ID_REQ > dia2gsup -> HLR: ID_ACK > HLR -> dia2gsup: ID_ACK > dia2gsup -> HLR: ID_RESP > [App traffic! Joy!] this also looks valid to me, in-line with the pcap's I mentioned earlier -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e Gerrit-Change-Number: 20019 Gerrit-PatchSet: 3 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Reviewer: neels Gerrit-Comment-Date: Sun, 20 Sep 2020 09:34:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:42:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:42:44 +0000 Subject: Change in osmo-ci[master]: jobs: Enable --without-sse build variant for osmo-trx In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20207 ) Change subject: jobs: Enable --without-sse build variant for osmo-trx ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47a2067dc25335557dfa93f291f6ca9cd4959735 Gerrit-Change-Number: 20207 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:42:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:42:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:42:47 +0000 Subject: Change in osmo-ci[master]: jobs: Enable --without-sse build variant for osmo-trx In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20207 ) Change subject: jobs: Enable --without-sse build variant for osmo-trx ...................................................................... jobs: Enable --without-sse build variant for osmo-trx Change-Id: I47a2067dc25335557dfa93f291f6ca9cd4959735 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index b84e70e..486ecd3 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -212,11 +212,12 @@ - osmo-trx: slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible] a1_name: INSTR - a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] + a1: !!python/tuple [--with-sse, --without-sse --with-neon, --with-neon-vfpv4] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] combination_filter: > - (INSTR == "--with-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || + (INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || + (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") cmd: 'ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh' diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index c2b671e..47a9eea 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -300,11 +300,12 @@ - osmo-trx: slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-deb9build-ansible] a1_name: INSTR - a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] + a1: !!python/tuple [--with-sse, --without-sse, --with-neon, --with-neon-vfpv4] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] combination_filter: > - (INSTR == "--with-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || + (INSTR == "--without-sse" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") || + (INSTR == "--with-sse" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") || (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47a2067dc25335557dfa93f291f6ca9cd4959735 Gerrit-Change-Number: 20207 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:43:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:43:29 +0000 Subject: Change in libosmocore[master]: ipaccess.h: Add more enum values and 'official' names In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20197 ) Change subject: ipaccess.h: Add more enum values and 'official' names ...................................................................... ipaccess.h: Add more enum values and 'official' names Originally we only learned about the protocol from looking at hexdumps without any specification or the like. Due to a GPL request to ip.acecss, we actually do have an 'official' resource: The packet-ipa.c from their wireshark-1.0.6ipa27.tar.gz Let's use its contents to complete our definitions here. Change-Id: Ic1f2b32c72d162f31b422293d2a361d528443f01 --- M include/osmocom/gsm/protocol/ipaccess.h 1 file changed, 23 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/ipaccess.h b/include/osmocom/gsm/protocol/ipaccess.h index 80413d1..4f1d0b1 100644 --- a/include/osmocom/gsm/protocol/ipaccess.h +++ b/include/osmocom/gsm/protocol/ipaccess.h @@ -42,26 +42,35 @@ }; enum ipaccess_msgtype { - IPAC_MSGT_PING = 0x00, - IPAC_MSGT_PONG = 0x01, - IPAC_MSGT_ID_GET = 0x04, - IPAC_MSGT_ID_RESP = 0x05, - IPAC_MSGT_ID_ACK = 0x06, + IPAC_MSGT_PING = 0x00, /* Heartbeet */ + IPAC_MSGT_PONG = 0x01, /* Heartbeat Ack */ + IPAC_MSGT_ID_GET = 0x04, /* Identity Request */ + IPAC_MSGT_ID_RESP = 0x05, /* Identity */ + IPAC_MSGT_ID_ACK = 0x06, /* Identity Ack */ + IPAC_MSGT_ID_NACK = 0x07, /* Identity Nack */ + IPAC_MSGT_PROXY = 0x08, /* Proxy */ + IPAC_MSGT_PROXY_ACK = 0x09, /* Proxy Ack */ + IPAC_MSGT_PROXY_NACK = 0x0a, /* Proxy Nack */ + IPAC_MSGT_SSL_INFO = 0x0b, /* SSL Info */ /* OpenBSC extension */ IPAC_MSGT_SCCP_OLD = 0xff, }; enum ipaccess_id_tags { - IPAC_IDTAG_SERNR = 0x00, - IPAC_IDTAG_UNITNAME = 0x01, - IPAC_IDTAG_LOCATION1 = 0x02, - IPAC_IDTAG_LOCATION2 = 0x03, - IPAC_IDTAG_EQUIPVERS = 0x04, - IPAC_IDTAG_SWVERSION = 0x05, - IPAC_IDTAG_IPADDR = 0x06, - IPAC_IDTAG_MACADDR = 0x07, - IPAC_IDTAG_UNIT = 0x08, + IPAC_IDTAG_SERNR = 0x00, /* Unit Serial Number */ + IPAC_IDTAG_UNITNAME = 0x01, /* Unit Name */ + IPAC_IDTAG_LOCATION1 = 0x02, /* Unit Location */ + IPAC_IDTAG_LOCATION2 = 0x03, /* Unit Type */ + IPAC_IDTAG_EQUIPVERS = 0x04, /* Hardware Version */ + IPAC_IDTAG_SWVERSION = 0x05, /* Software Version */ + IPAC_IDTAG_IPADDR = 0x06, /* IP Address */ + IPAC_IDTAG_MACADDR = 0x07, /* Ethernet Address */ + IPAC_IDTAG_UNIT = 0x08, /* Unit ID */ + IPAC_IDTAG_USERNAME = 0x09, /* User Name */ + IPAC_IDTAG_PASSWORD = 0x0a, /* Password */ + IPAC_IDTAG_ACCESS_CLASS = 0x0b, /* Access Class */ + IPAC_IDTG_APP_PROTO_VER = 0x0c, /* Application Protocol Version */ }; /* -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1f2b32c72d162f31b422293d2a361d528443f01 Gerrit-Change-Number: 20197 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:43:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:43:29 +0000 Subject: Change in libosmocore[master]: ns2: Improve/extend doxygen comments for new ns2 implementation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20208 ) Change subject: ns2: Improve/extend doxygen comments for new ns2 implementation ...................................................................... ns2: Improve/extend doxygen comments for new ns2 implementation I was reading through the code and noticed many functions not documented yet, or with incomplete documentation. Change that. Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_message.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vc_fsm.c 6 files changed, 197 insertions(+), 126 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 0fa7197..21a45a1 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -203,6 +203,11 @@ .class_id = OSMO_STATS_CLASS_PEER, }; +/*! string-format a given NS-VC into a user-supplied buffer. + * \param[in] buf user-allocated output buffer + * \param[in] buf_len size of user-allocated output buffer in bytes + * \param[in] nsvc NS-VC to be string-formatted + * \return pointer to buf on success; NULL on error */ char *gprs_ns2_ll_str_buf(char *buf, size_t buf_len, struct gprs_ns2_vc *nsvc) { struct osmo_sockaddr *local; @@ -256,12 +261,19 @@ /* udp is the longest: udp)[IP6]:65536<65536>[IP6]:65536 */ #define NS2_LL_MAX_STR 4+2*(INET6_ADDRSTRLEN+9)+8 +/*! string-format a given NS-VC to a thread-local static buffer. + * \param[in] nsvc NS-VC to be string-formatted + * \return pointer to the string on success; NULL on error */ const char *gprs_ns2_ll_str(struct gprs_ns2_vc *nsvc) { static __thread char buf[NS2_LL_MAX_STR]; return gprs_ns2_ll_str_buf(buf, sizeof(buf), nsvc); } +/*! string-format a given NS-VC to a dynamically allocated string. + * \param[in] ctx talloc context from which to allocate + * \param[in] nsvc NS-VC to be string-formatted + * \return pointer to the string on success; NULL on error */ char *gprs_ns2_ll_str_c(const void *ctx, struct gprs_ns2_vc *nsvc) { char *buf = talloc_size(ctx, NS2_LL_MAX_STR); @@ -270,12 +282,10 @@ return gprs_ns2_ll_str_buf(buf, NS2_LL_MAX_STR, nsvc); } -/*! - * Receive a primitive from the NS User (Gb) - * \param nsi - * \param oph The primitive. - * \return 0 on success - */ +/*! Receive a primitive from the NS User (Gb). + * \param[in] nsi NS instance to which the primitive is issued + * \param[in] oph The primitive + * \return 0 on success; negative on error */ int gprs_ns2_recv_prim(struct gprs_ns2_inst *nsi, struct osmo_prim_hdr *oph) { /* TODO: implement load distribution function */ @@ -329,6 +339,11 @@ return ns2_tx_unit_data(nsvc, bvci, sducontrol, oph->msg); } +/*! Send a STATUS.ind primitive to the specified NS instance user. + * \param[in] nsi NS instance on which we operate + * \param[in] nsei NSEI to which the statue relates + * \param[in] bvci BVCI to which the status relates + * \param[in] cause The cause of the status */ void ns2_prim_status_ind(struct gprs_ns2_inst *nsi, uint16_t nsei, uint16_t bvci, enum gprs_ns2_affecting_cause cause) @@ -343,13 +358,11 @@ nsi->cb(&nsp.oph, nsi->cb_data); } -/*! - * \brief ns2_vc_alloc - * \param bind - * \param nse - * \param initiater - if this is an incoming remote (!initiater) or a local outgoing connection (initater) - * \return - */ +/*! Allocate a NS-VC within the given bind + NSE. + * \param[in] bind The 'bind' on which we operate + * \param[in] nse The NS Entity on which we operate + * \param[in] initiater - if this is an incoming remote (!initiater) or a local outgoing connection (initater) + * \return newly allocated NS-VC on success; NULL on error */ struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_nse *nse, bool initiater) { struct gprs_ns2_vc *nsvc = talloc_zero(bind, struct gprs_ns2_vc); @@ -390,7 +403,8 @@ return NULL; } - +/*! Destroy/release given NS-VC. + * \param[in] nsvc NS-VC to destroy */ void gprs_ns2_free_nsvc(struct gprs_ns2_vc *nsvc) { if (!nsvc) @@ -419,6 +433,7 @@ talloc_free(nsvc); } +/*! Allocate a message buffer for use with the NS2 stack. */ struct msgb *gprs_ns2_msgb_alloc(void) { struct msgb *msg = msgb_alloc_headroom(NS_ALLOC_SIZE, NS_ALLOC_HEADROOM, @@ -430,14 +445,12 @@ return msg; } -/*! - * Create a status message to be sent over a new connection. - * \param[in] orig_msg the original message - * \param[in] tp TLVP parsed of the original message - * \param[out] reject - * \param[in] cause - * \return 0 on success - */ +/*! Create a status message to be sent over a new connection. + * \param[in] orig_msg the original message + * \param[in] tp TLVP parsed of the original message + * \param[out] reject callee-allocated message buffer of the generated NS-STATUS + * \param[in] cause Cause for the rejection + * \return 0 on success */ static int reject_status_msg(struct msgb *orig_msg, struct tlv_parsed *tp, struct msgb **reject, enum ns_cause cause) { struct msgb *msg = gprs_ns2_msgb_alloc(); @@ -492,6 +505,10 @@ return 0; } +/*! Resolve a NS Entity based on its NSEI. + * \param[in] nsi NS Instance in which we do the look-up + * \param[in] nsei NSEI to look up + * \return NS Entity in successful case; NULL if none found */ struct gprs_ns2_nse *gprs_ns2_nse_by_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei) { struct gprs_ns2_nse *nse; @@ -504,6 +521,10 @@ return NULL; } +/*! Resolve a NS-VC Entity based on its NS-VCI. + * \param[in] nsi NS Instance in which we do the look-up + * \param[in] nsvci NS-VCI to look up + * \return NS-VC Entity in successful case; NULL if none found */ struct gprs_ns2_vc *gprs_ns2_nsvc_by_nsvci(struct gprs_ns2_inst *nsi, uint16_t nsvci) { struct gprs_ns2_nse *nse; @@ -519,6 +540,10 @@ return NULL; } +/*! Create a NS Entity within given NS instance. + * \param[in] nsi NS instance in which to create NS Entity + * \param[in] nsei NS Entity Identifier of to-be-created NSE + * \returns newly-allocated NS-E in successful case; NULL on error */ struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei) { struct gprs_ns2_nse *nse; @@ -541,6 +566,8 @@ return nse; } +/*! Destroy given NS Entity. + * \param[in] nse NS Entity to destroy */ void gprs_ns2_free_nse(struct gprs_ns2_nse *nse) { struct gprs_ns2_vc *nsvc, *tmp; @@ -574,15 +601,13 @@ } -/*! - * Create a new VC based on a message. Depending on the bind it might create NSE. - * \param[in] bind - * \param[in] msg - * \param[in] logname A name to describe the VC. E.g. ip address pair - * \param[out] reject A message filled to be sent back. Only used in failure cases. - * \param[out] success A pointer which will be set to the new VC on success - * \return - */ +/*! Create a new NS-VC based on a [received] message. Depending on the bind it might create a NSE. + * \param[in] bind the bind through which msg was received + * \param[in] msg the actual received message + * \param[in] logname A name to describe the VC. E.g. ip address pair + * \param[out] reject A message filled to be sent back. Only used in failure cases. + * \param[out] success A pointer which will be set to the new VC on success + * \return enum value indicating the status, e.g. GPRS_NS2_CS_CREATED */ enum gprs_ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind, struct msgb *msg, const char *logname, @@ -696,6 +721,12 @@ return GPRS_NS2_CS_CREATED; } +/*! Create, and connect an inactive, new IP-based NS-VC + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nse NS Entity in which the NS-VC is to be created + * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET + * \return pointer to newly-allocated, connected and inactive NS-VC; NULL on error */ struct gprs_ns2_vc *gprs_ns2_ip_connect_inactive(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, struct gprs_ns2_nse *nse, @@ -715,14 +746,12 @@ return nsvc; } -/*! - * Create a new IP-based NSVC - * \param bind - * \param remote - * \param nse - * \param nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET - * \return - */ +/*! Create, connect and activate a new IP-based NS-VC + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nse NS Entity in which the NS-VC is to be created + * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET + * \return pointer to newly-allocated, connected and activated NS-VC; NULL on error */ struct gprs_ns2_vc *gprs_ns2_ip_connect(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, struct gprs_ns2_nse *nse, @@ -738,14 +767,12 @@ return nsvc; } -/*! - * Create a new IP-based NSVC - * \param bind - * \param remote - * \param nsei - * \param nsvci only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET - * \return - */ +/*! Create, connect and activate a new IP-based NS-VC + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nsei NSEI of the NS Entity in which the NS-VC is to be created + * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET + * \return pointer to newly-allocated, connected and activated NS-VC; NULL on error */ struct gprs_ns2_vc *gprs_ns2_ip_connect2(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, uint16_t nsei, @@ -762,13 +789,11 @@ return gprs_ns2_ip_connect(bind, remote, nse, nsvci); } -/*! - * Create a new IP SNS NSE - * \param bind - * \param remote - * \param nsei - * \return 0 on success - */ +/*! Create, connect and activate a new IP-SNS NSE. + * \param[in] bind bind in which the new NS-VC is to be created + * \param[in] remote remote address to which to connect + * \param[in] nsei NSEI of the NS Entity in which the NS-VC is to be created + * \return 0 on success; negative on error */ int gprs_ns2_ip_connect_sns(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *remote, uint16_t nsei) @@ -795,6 +820,10 @@ return ns2_sns_bss_fsm_start(nse, nsvc, remote); } +/*! Find NS-VC for given socket address. + * \param[in] nse NS Entity in which to search + * \param[in] sockaddr socket address to search for + * \return NS-VC matching sockaddr; NULL if none found */ struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr(struct gprs_ns2_nse *nse, struct osmo_sockaddr *sockaddr) { @@ -814,13 +843,11 @@ } -/*! - * \brief gprs_ns2_recv_vc entrypoint of received NS PDU from the driver/bind - * \param nsi - * \param vc - * \param msg the received message. Must not be freeded. - * \return - */ +/*! Bottom-side entry-point for received NS PDU from the driver/bind + * \param[in] nsi NS instance + * \param[in] nsvc NS-VC for which the message was received + * \param msg the received message. Ownership is trasnferred, caller must not free it! + * \return 0 on success; negative on error */ int ns2_recv_vc(struct gprs_ns2_inst *nsi, struct gprs_ns2_vc *nsvc, struct msgb *msg) @@ -893,7 +920,9 @@ return rc; } -/* notify a nse about the change of a nsvc */ +/*! Notify a nse about the change of a NS-VC. + * \param[in] nsvc NS-VC which has detected the change (and shall not be notified). + * \param[in] unblocked whether the NSE should be marked as unblocked (true) or blocked (false) */ void ns2_nse_notify_unblocked(struct gprs_ns2_vc *nsvc, bool unblocked) { struct gprs_ns2_nse *nse = nsvc->nse; @@ -928,11 +957,10 @@ } /*! Create a new GPRS NS instance - * \param[in] ctx a talloc context - * \param[in] cb Call-back function for incoming BSSGP data - * \param[in] cb_data Call-back data - * \returns dynamically allocated gprs_ns_inst - */ + * \param[in] ctx a talloc context to allocate NS instance from + * \param[in] cb Call-back function for dispatching primitives to the user + * \param[in] cb_data transparent user data passed to Call-back + * \returns dynamically allocated gprs_ns_inst; NULL on error */ struct gprs_ns2_inst *gprs_ns2_instantiate(void *ctx, osmo_prim_cb cb, void *cb_data) { struct gprs_ns2_inst *nsi; @@ -958,6 +986,8 @@ return nsi; } +/*! Destroy a NS Instance (including all its NSEs, binds, ...). + * \param[in] nsi NS instance to destroy */ void gprs_ns2_free(struct gprs_ns2_inst *nsi) { struct gprs_ns2_vc_bind *bind, *tbind; @@ -975,11 +1005,10 @@ } } -/*! - * \brief gprs_ns2_dynamic_create_nse - * \param nsi the instance to modify - * \param create_nse if NSE can be created on receiving package. SGSN set this. - * \return +/*! Configure whether a NS Instance should dynamically create NSEs based on incoming traffic. + * \param nsi the instance to modify + * \param create_nse if NSE can be created on receiving package. SGSN set this. + * \return 0 on success; negative on error */ int gprs_ns2_dynamic_create_nse(struct gprs_ns2_inst *nsi, bool create_nse) { @@ -988,6 +1017,8 @@ return 0; } +/*! Start the NS-ALIVE FSM in all NS-VCs of given NSE. + * \param[in] nse NS Entity in whihc to start NS-ALIVE FSMs */ void gprs_ns2_start_alive_all_nsvcs(struct gprs_ns2_nse *nse) { struct gprs_ns2_vc *nsvc; @@ -1001,11 +1032,16 @@ } } +/*! Set the mode of given bind. + * \param[in] bind the bind we want to set the mode of + * \param[in] modde mode to set bind to */ void gprs_ns2_bind_set_mode(struct gprs_ns2_vc_bind *bind, enum gprs_ns2_vc_mode mode) { bind->vc_mode = mode; } +/*! Destroy a given bind. + * \param[in] bind the bind we want to destroy */ void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind) { struct gprs_ns2_vc *nsvc, *tmp; diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 2b19157..715c41a 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -528,11 +528,18 @@ return rc; } +/*! determine if given bind is for FR-GRE encapsulation. */ int gprs_ns2_is_frgre_bind(struct gprs_ns2_vc_bind *bind) { return (bind->driver == &vc_driver_frgre); } +/*! Create a new bind for NS over FR-GRE. + * \param[in] nsi NS instance in which to create the bind + * \param[in] local local address on which to bind + * \param[in] dscp DSCP/TOS bits to use for transmitted data on this bind + * \param[out] result pointer to created bind + * \return 0 on success; negative on error */ int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi, struct osmo_sockaddr *local, int dscp, diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 7742404..b4063f5 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -202,11 +202,10 @@ return nsvc->bind->send_vc(nsvc, msg); } -/*! Transmit a NS-BLOCK on a given NS-VC +/*! Transmit a NS-BLOCK on a given NS-VC. * \param[in] vc NS-VC on which the NS-BLOCK is to be transmitted * \param[in] cause Numeric NS Cause value - * \returns 0 in case of success - */ + * \returns 0 in case of success */ int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause) { struct msgb *msg; @@ -236,10 +235,9 @@ return nsvc->bind->send_vc(nsvc, msg); } -/*! Transmit a NS-BLOCK-ACK on a given NS-VC +/*! Transmit a NS-BLOCK-ACK on a given NS-VC. * \param[in] nsvc NS-VC on which the NS-BLOCK is to be transmitted - * \returns 0 in case of success - */ + * \returns 0 in case of success */ int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc) { struct msgb *msg; @@ -266,10 +264,10 @@ return nsvc->bind->send_vc(nsvc, msg); } -/*! Transmit a NS-RESET on a given NSVC +/*! Transmit a NS-RESET on a given NS-VC. * \param[in] nsvc NS-VC used for transmission * \paam[in] cause Numeric NS cause value - */ + * \returns 0 in case of success */ int ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause) { struct msgb *msg; @@ -299,13 +297,16 @@ return nsvc->bind->send_vc(nsvc, msg); } -/* Section 9.2.6 */ +/*! Transmit a NS-RESET-ACK on a given NS-VC. + * \param[in] nsvc NS-VC used for transmission + * \returns 0 in case of success */ int ns2_tx_reset_ack(struct gprs_ns2_vc *nsvc) { struct msgb *msg; struct gprs_ns_hdr *nsh; uint16_t nsvci, nsei; + /* Section 9.2.6 */ log_set_context(LOG_CTX_GB_NSVC, nsvc); ERR_IF_NSVC_USES_SNS(nsvc, "transmit NS RESET ACK"); @@ -331,10 +332,9 @@ return nsvc->bind->send_vc(nsvc, msg); } -/*! Transmit a NS-UNBLOCK on a given NS-VC +/*! Transmit a NS-UNBLOCK on a given NS-VC. * \param[in] nsvc NS-VC on which the NS-UNBLOCK is to be transmitted - * \returns 0 in case of success - */ + * \returns 0 in case of success */ int ns2_tx_unblock(struct gprs_ns2_vc *nsvc) { log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -348,10 +348,9 @@ } -/*! Transmit a NS-UNBLOCK-ACK on a given NS-VC +/*! Transmit a NS-UNBLOCK-ACK on a given NS-VC. * \param[in] nsvc NS-VC on which the NS-UNBLOCK-ACK is to be transmitted - * \returns 0 in case of success - */ + * \returns 0 in case of success */ int ns2_tx_unblock_ack(struct gprs_ns2_vc *nsvc) { log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -364,10 +363,9 @@ return ns2_tx_simple(nsvc, NS_PDUT_UNBLOCK_ACK); } -/*! Transmit a NS-ALIVE on a given NS-VC +/*! Transmit a NS-ALIVE on a given NS-VC. * \param[in] nsvc NS-VC on which the NS-ALIVE is to be transmitted - * \returns 0 in case of success - */ + * \returns 0 in case of success */ int ns2_tx_alive(struct gprs_ns2_vc *nsvc) { log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -377,10 +375,9 @@ return ns2_tx_simple(nsvc, NS_PDUT_ALIVE); } -/*! Transmit a NS-ALIVE-ACK on a given NS-VC +/*! Transmit a NS-ALIVE-ACK on a given NS-VC. * \param[in] nsvc NS-VC on which the NS-ALIVE-ACK is to be transmitted - * \returns 0 in case of success - */ + * \returns 0 in case of success */ int ns2_tx_alive_ack(struct gprs_ns2_vc *nsvc) { log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -390,6 +387,12 @@ return ns2_tx_simple(nsvc, NS_PDUT_ALIVE_ACK); } +/*! Transmit NS-UNITDATA on a given NS-VC. + * \param[in] nsvc NS-VC on which the NS-UNITDATA is to be transmitted + * \param[in] bvci BVCI to encode in NS-UNITDATA header + * \param[in] sducontrol SDU control octet of NS header + * \param[in] msg message buffer containing payload + * \returns 0 in case of success */ int ns2_tx_unit_data(struct gprs_ns2_vc *nsvc, uint16_t bvci, uint8_t sducontrol, struct msgb *msg) @@ -414,11 +417,12 @@ return nsvc->bind->send_vc(nsvc, msg); } -/*! Transmit a NS-STATUS on a given NSVC +/*! Transmit a NS-STATUS on a given NS-VC. * \param[in] nsvc NS-VC to be used for transmission * \param[in] cause Numeric NS cause value * \param[in] bvci BVCI to be reset within NSVC - * \param[in] orig_msg message causing the STATUS */ + * \param[in] orig_msg message causing the STATUS + * \returns 0 in case of success */ int ns2_tx_status(struct gprs_ns2_vc *nsvc, uint8_t cause, uint16_t bvci, struct msgb *orig_msg) { diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index d4bed84..812200d 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -1198,6 +1198,10 @@ .log_subsys = DLNS, }; +/*! Allocate an IP-SNS FSM for the BSS side. + * \param[in] nse NS Entity in which the FSM runs + * \param[in] id string identifier + * \retruns FSM instance on success; NULL on error */ struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse, const char *id) { @@ -1221,6 +1225,11 @@ return NULL; } +/*! Start an IP-SNS FSM. + * \param[in] nse NS Entity whose IP-SNS FSM shall be started + * \param[in] nsvc Initial NS-VC + * \param[in] remote remote (SGSN) address + * \returns 0 on success; negative on error */ int ns2_sns_bss_fsm_start(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, struct osmo_sockaddr *remote) { struct osmo_fsm_inst *fi = nse->bss_sns_fi; @@ -1340,7 +1349,11 @@ return -1; } -/* main entry point for receiving SNS messages from the network */ +/*! main entry point for receiving SNS messages from the network. + * \param[in] nsvc NS-VC on which the message was received + * \param[in] msg message buffer of the IP-SNS message + * \param[in] tp parsed TLV structure of message + * \retruns 0 on success; negative on error */ int gprs_ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp) { struct gprs_ns2_nse *nse = nsvc->nse; @@ -1418,6 +1431,10 @@ ip_addr, ntohs(ip6->udp_port), ip6->sig_weight, ip6->data_weight, VTY_NEWLINE); } +/*! Dump the IP-SNS state to a vty. + * \param[in] vty VTY to which the state shall be printed + * \param[in] nse NS Entity whose IP-SNS state shall be printed + * \param[in] stats Whether or not statistics shall also be printed */ void gprs_ns2_sns_dump_vty(struct vty *vty, const struct gprs_ns2_nse *nse, bool stats) { struct ns2_sns_state *gss; diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index f317219..bb421a7 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -78,6 +78,11 @@ nsvc->priv = NULL; } +/*! Find a NS-VC by its remote socket address. + * \param[in] bind in which to search + * \param[in] saddr remote peer socket adddress to search + * \param[out] result pointer to result + * \returns 0 on success; 1 if no NS-VC was found; negative on error */ int gprs_ns2_find_vc_by_sockaddr(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr, struct gprs_ns2_vc **result) { struct gprs_ns2_vc *nsvc; @@ -115,12 +120,10 @@ return rc; } -/*! - * \brief nsip_vc_sendmsg will send the msg and free msgb afterwards. - * \param vc - * \param msg - * \return < 0 on erros, otherwise the bytes sent. - */ +/*! send the msg and free it afterwards. + * \param nsvc NS-VC on which the message shall be sent + * \param msg message to be sent + * \return number of bytes transmitted; negative on error */ static int nsip_vc_sendmsg(struct gprs_ns2_vc *nsvc, struct msgb *msg) { int rc; @@ -241,13 +244,12 @@ return rc; } -/*! - * \brief bind to an IPv4/IPv6 address - * \param[in] nsi NS Instance in which to create the NSVC - * \param[in] address the address to bind to - * \param[out] result if set, returns the bind object - * \return - */ +/*! Bind to an IPv4/IPv6 address + * \param[in] nsi NS Instance in which to create the NSVC + * \param[in] local the local address to bind to + * \param[in] dscp the DSCP/TOS bits used for transmitted data + * \param[out] result if set, returns the bind object + * \return 0 on success; negative in case of error */ int gprs_ns2_ip_bind(struct gprs_ns2_inst *nsi, struct osmo_sockaddr *local, int dscp, @@ -310,6 +312,11 @@ return 0; } +/*! Create new NS-VC to a given remote address + * \param[in] bind the bind we want to connect + * \param[in] nse NS entity to be used for the new NS-VC + * \param[in] remote remote address to connect to + * \return pointer to newly-allocated and connected NS-VC; NULL on error */ struct gprs_ns2_vc *gprs_ns2_ip_bind_connect(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_nse *nse, struct osmo_sockaddr *remote) @@ -332,6 +339,9 @@ return nsvc; } +/*! Return the socket address of the remote peer of a NS-VC. + * \param[in] nsvc NS-VC whose remote peer we want to know + * \return address of the remote peer; NULL in case of error */ struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc) { struct priv_vc *priv; @@ -343,6 +353,9 @@ return &priv->remote; } +/*! Return the locally bound socket address of the bind. + * \param[in] bind The bind whose local address we want to know + * \return address of the local bind */ struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind) { struct priv_bind *priv; @@ -351,11 +364,13 @@ return &priv->addr; } +/*! Is the given bind an IP bind? */ int gprs_ns2_is_ip_bind(struct gprs_ns2_vc_bind *bind) { return (bind->driver == &vc_driver_ip); } +/*! Set the DSCP (TOS) bit value of the given bind. */ int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp) { struct priv_bind *priv; diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 7487ecd..33a0328 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -584,11 +584,9 @@ return fi; } -/*! - * \brief gprs_ns2_vc_fsm_start start the FSM - * \param vc the virtual circuit - * \return 0 on success - */ +/*! Start a NS-VC FSM. + * \param nsvc the virtual circuit + * \return 0 on success; negative on error */ int gprs_ns2_vc_fsm_start(struct gprs_ns2_vc *nsvc) { /* allows to call this function even for started nsvc by gprs_ns2_start_alive_all_nsvcs */ @@ -597,13 +595,11 @@ return 0; } -/*! - * \brief gprs_ns2_vc_rx entry point for messages from the driver/VL - * \param vc the virtual circuit on which is recived - * \param msg the message - * \param tp the parsed TLVs - * \return 0 on success - */ +/*! entry point for messages from the driver/VL + * \param nsvc virtual circuit on which the message was received + * \param msg message that was received + * \param tp parsed TLVs of the received message + * \return 0 on success; negative on error */ int gprs_ns2_vc_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp) { struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; @@ -658,11 +654,7 @@ return 0; } -/*! - * \brief gprs_ns2_vc_is_alive says if this - * \param vc - * \return - */ +/*! is the given NS-VC unblocked? */ int gprs_ns2_vc_is_unblocked(struct gprs_ns2_vc *nsvc) { return (nsvc->fi->state == GPRS_NS2_ST_UNBLOCKED); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85a2419604a9fd9ff3c4828a7463e222652f77bf Gerrit-Change-Number: 20208 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:43:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:43:30 +0000 Subject: Change in libosmocore[master]: ns2: Use NULL and not '0' when returning a NULL-Pointer In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20209 ) Change subject: ns2: Use NULL and not '0' when returning a NULL-Pointer ...................................................................... ns2: Use NULL and not '0' when returning a NULL-Pointer Change-Id: I9458e6dcf8133fbcfbc89437e58aad049a6d432b --- M src/gb/gprs_ns2.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 21a45a1..57a08d1 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -216,7 +216,7 @@ struct osmo_sockaddr_str remote_str; if (!buf_len) - return 0; + return NULL; switch (nsvc->ll) { case GPRS_NS_LL_UDP: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9458e6dcf8133fbcfbc89437e58aad049a6d432b Gerrit-Change-Number: 20209 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:43:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:43:30 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Mark gprs_ns2_validate_* as static In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20210 ) Change subject: gprs_ns2: Mark gprs_ns2_validate_* as static ...................................................................... gprs_ns2: Mark gprs_ns2_validate_* as static They are all called indirectly via gprs_ns2_validate(), so mark them as static. Change-Id: I8425ed3da32019b86cf12d3c27132f07d931cf27 --- M src/gb/gprs_ns2_message.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index b4063f5..fac6108 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -64,7 +64,7 @@ -int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_CAUSE) || !TLVP_PRESENT(tp, NS_IE_VCI) || !TLVP_PRESENT(tp, NS_IE_NSEI)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -74,7 +74,7 @@ return 0; } -int gprs_ns2_validate_reset_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_reset_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_VCI) || !TLVP_PRESENT(tp, NS_IE_NSEI)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -84,7 +84,7 @@ return 0; } -int gprs_ns2_validate_block(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_block(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_VCI) || !TLVP_PRESENT(tp, NS_IE_CAUSE)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -94,7 +94,7 @@ return 0; } -int gprs_ns2_validate_block_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_block_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_VCI)) { *cause = NS_CAUSE_MISSING_ESSENT_IE; @@ -104,7 +104,7 @@ return 0; } -int gprs_ns2_validate_status(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) +static int gprs_ns2_validate_status(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRESENT(tp, NS_IE_CAUSE)) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8425ed3da32019b86cf12d3c27132f07d931cf27 Gerrit-Change-Number: 20210 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:44:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:44:14 +0000 Subject: Change in ...osmo_ss7[master]: ebin/app: Add missing ipa_proto_ccm module In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20211 ) Change subject: ebin/app: Add missing ipa_proto_ccm module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I5b7338341a9e179b41b8f2f092efe9aaf83451bb Gerrit-Change-Number: 20211 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:44:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:44:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:44:16 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Allow configuring ack initiation behavior In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 ) Change subject: ipa_proto: Allow configuring ack initiation behavior ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e Gerrit-Change-Number: 20019 Gerrit-PatchSet: 3 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Reviewer: neels Gerrit-Comment-Date: Sun, 20 Sep 2020 09:44:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:48:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:48:33 +0000 Subject: Change in pysim[master]: utils.py: Add helper method to encode Service Table In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20171 ) Change subject: utils.py: Add helper method to encode Service Table ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0c97317d5a17aa0df720659d021b5cbf7d30edcc Gerrit-Change-Number: 20171 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:48:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:49:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:49:14 +0000 Subject: Change in pysim[master]: Remove redundant hexstr_to_fivebytearr() and hexstr_to_threebytearr()... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20196 ) Change subject: Remove redundant hexstr_to_fivebytearr() and hexstr_to_threebytearr() functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7848451b90b35dca29d29f630cdc5405b5e9c19b Gerrit-Change-Number: 20196 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:49:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:49:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:49:16 +0000 Subject: Change in pysim[master]: Use generic function hexstr_to_Nbytearr to convert hex string to 3/5 ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20195 ) Change subject: Use generic function hexstr_to_Nbytearr to convert hex string to 3/5 Bytes array ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1165e4928d063667f0b4dfc3437c9278e7ec7450 Gerrit-Change-Number: 20195 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:49:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:49:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:49:18 +0000 Subject: Change in pysim[master]: utils.py: Add helper method to convert a hex string into array of N b... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20172 ) Change subject: utils.py: Add helper method to convert a hex string into array of N bytes string elements ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3af080726079729eae92af183de40dfc70c9390e Gerrit-Change-Number: 20172 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:49:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:49:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:49:22 +0000 Subject: Change in pysim[master]: utils.py: Add helper method to encode Service Table In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/20171 ) Change subject: utils.py: Add helper method to encode Service Table ...................................................................... utils.py: Add helper method to encode Service Table This method helps in encoding of Service Tables in EF.SST, EF.UST, EF.EST, EF.IST. Takes original hex string of EF.SST, EF.UST, EF.EST, EF.IST, Service number, Service to be enabled or disable flag as input and outputs the modified Service Table. Change-Id: I0c97317d5a17aa0df720659d021b5cbf7d30edcc --- M pySim/utils.py 1 file changed, 43 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/utils.py b/pySim/utils.py index dc14d58..d0d6cb5 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -460,6 +460,49 @@ bytelist = bytelist[ L+2 : ] return ret +def enc_st(st, service, state=1): + """ + Encodes the EF S/U/IST/EST and returns the updated Service Table + + Parameters: + st - Current value of SIM/USIM/ISIM Service Table + service - Service Number to encode as activated/de-activated + state - 1 mean activate, 0 means de-activate + + Returns: + s - Modified value of SIM/USIM/ISIM Service Table + + Default values: + - state: 1 - Sets the particular Service bit to 1 + """ + st_bytes = [st[i:i+2] for i in range(0, len(st), 2) ] + + s = "" + # Check whether the requested service is present in each byte + for i in range(0, len(st_bytes)): + # Byte i contains info about Services num (8i+1) to num (8i+8) + if service in range((8*i) + 1, (8*i) + 9): + byte = int(st_bytes[i], 16) + # Services in each byte are in order MSB to LSB + # MSB - Service (8i+8) + # LSB - Service (8i+1) + mod_byte = 0x00 + # Copy bit by bit contents of byte to mod_byte with modified bit + # for requested service + for j in range(1, 9): + mod_byte = mod_byte >> 1 + if service == (8*i) + j: + mod_byte = state == 1 and mod_byte|0x80 or mod_byte&0x7f + else: + mod_byte = byte&0x01 == 0x01 and mod_byte|0x80 or mod_byte&0x7f + byte = byte >> 1 + + s += ('%02x' % (mod_byte)) + else: + s += st_bytes[i] + + return s + def dec_epdgid(hexstr): """ Decode ePDG Id to get EF.ePDGId or EF.ePDGIdEm. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0c97317d5a17aa0df720659d021b5cbf7d30edcc Gerrit-Change-Number: 20171 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:49:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:49:22 +0000 Subject: Change in pysim[master]: utils.py: Add helper method to convert a hex string into array of N b... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/20172 ) Change subject: utils.py: Add helper method to convert a hex string into array of N bytes string elements ...................................................................... utils.py: Add helper method to convert a hex string into array of N bytes string elements Change-Id: I3af080726079729eae92af183de40dfc70c9390e --- M pySim/utils.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/utils.py b/pySim/utils.py index d0d6cb5..e5434a5 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -128,6 +128,9 @@ def hexstr_to_threebytearr(s): return [s[i:i+6] for i in range(0, len(s), 6) ] +def hexstr_to_Nbytearr(s, nbytes): + return [s[i:i+(nbytes*2)] for i in range(0, len(s), (nbytes*2)) ] + # Accepts hex string representing three bytes def dec_mcc_from_plmn(plmn): ia = h2i(plmn) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3af080726079729eae92af183de40dfc70c9390e Gerrit-Change-Number: 20172 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:49:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:49:22 +0000 Subject: Change in pysim[master]: Use generic function hexstr_to_Nbytearr to convert hex string to 3/5 ... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/20195 ) Change subject: Use generic function hexstr_to_Nbytearr to convert hex string to 3/5 Bytes array ...................................................................... Use generic function hexstr_to_Nbytearr to convert hex string to 3/5 Bytes array Change-Id: I1165e4928d063667f0b4dfc3437c9278e7ec7450 --- M pySim/utils.py M pySim/utils_test.py 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/utils.py b/pySim/utils.py index e5434a5..43e4c53 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -180,7 +180,7 @@ def format_xplmn_w_act(hexstr): s = "" - for rec_data in hexstr_to_fivebytearr(hexstr): + for rec_data in hexstr_to_Nbytearr(hexstr, 5): rec_info = dec_xplmn_w_act(rec_data) if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF: rec_str = "unused" @@ -229,7 +229,7 @@ def format_xplmn(hexstr): s = "" - for rec_data in hexstr_to_threebytearr(hexstr): + for rec_data in hexstr_to_Nbytearr(hexstr, 3): rec_info = dec_xplmn(rec_data) if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF: rec_str = "unused" diff --git a/pySim/utils_test.py b/pySim/utils_test.py index ff028da..8db04bd 100644 --- a/pySim/utils_test.py +++ b/pySim/utils_test.py @@ -12,7 +12,7 @@ "ffffff0002", "ffffff0001", ] - self.assertEqual(utils.hexstr_to_fivebytearr(input_str), expected) + self.assertEqual(utils.hexstr_to_Nbytearr(input_str, 5), expected) def testDecMCCfromPLMN(self): self.assertEqual(utils.dec_mcc_from_plmn("92f501"), 295) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1165e4928d063667f0b4dfc3437c9278e7ec7450 Gerrit-Change-Number: 20195 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:49:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:49:23 +0000 Subject: Change in pysim[master]: Remove redundant hexstr_to_fivebytearr() and hexstr_to_threebytearr()... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/20196 ) Change subject: Remove redundant hexstr_to_fivebytearr() and hexstr_to_threebytearr() functions ...................................................................... Remove redundant hexstr_to_fivebytearr() and hexstr_to_threebytearr() functions These functions are replaced by a more generic function hexstr_to_Nbytearr(). And, all occurances of redundant functions are replaced by generic functions so its safe to remove them. Change-Id: I7848451b90b35dca29d29f630cdc5405b5e9c19b --- M pySim/utils.py 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/utils.py b/pySim/utils.py index 43e4c53..c5cf480 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -122,12 +122,6 @@ if oplmn_disp: byte1 = byte1|0x02 return i2h([byte1])+s2h(name) -def hexstr_to_fivebytearr(s): - return [s[i:i+10] for i in range(0, len(s), 10) ] - -def hexstr_to_threebytearr(s): - return [s[i:i+6] for i in range(0, len(s), 6) ] - def hexstr_to_Nbytearr(s, nbytes): return [s[i:i+(nbytes*2)] for i in range(0, len(s), (nbytes*2)) ] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7848451b90b35dca29d29f630cdc5405b5e9c19b Gerrit-Change-Number: 20196 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:50:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:50:11 +0000 Subject: Change in osmo-msc[master]: mncc_call: fix memory overrun In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20201 ) Change subject: mncc_call: fix memory overrun ...................................................................... Patch Set 1: Code-Review+2 not merging, waiting for neels' take on this -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifff28b3375d6bd5e4f837f25c46736952f7bfa9b Gerrit-Change-Number: 20201 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: neels Gerrit-Comment-Date: Sun, 20 Sep 2020 09:50:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:51:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:51:13 +0000 Subject: Change in osmo-sgsn[master]: gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20203 ) Change subject: gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id9fdfb0d88264671546f8dfc4655032ff27bf43e Gerrit-Change-Number: 20203 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:51:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:51:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:51:15 +0000 Subject: Change in osmo-sgsn[master]: gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20203 ) Change subject: gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it ...................................................................... gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it In rare cases the LLME is NULL even when the mmctx is valid. Ensure not accessing a NULL pointer. Change-Id: Id9fdfb0d88264671546f8dfc4655032ff27bf43e --- M src/sgsn/gprs_llc.c 1 file changed, 16 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sgsn/gprs_llc.c b/src/sgsn/gprs_llc.c index 6e22e65..e357d16 100644 --- a/src/sgsn/gprs_llc.c +++ b/src/sgsn/gprs_llc.c @@ -376,20 +376,24 @@ * not yet have a MMC context (e.g. XID negotiation of primarly * LLC connection from GMM sapi). */ if (mmctx) { + /* In rare cases the LLME is NULL in those cases don't + * use the mm radio capabilities */ dup.imsi = mmctx->imsi; - dup.drx_parms = mmctx->drx_parms; - dup.ms_ra_cap.len = mmctx->ms_radio_access_capa.len; - dup.ms_ra_cap.v = mmctx->ms_radio_access_capa.buf; + if (mmctx->gb.llme) { + dup.drx_parms = mmctx->drx_parms; + dup.ms_ra_cap.len = mmctx->ms_radio_access_capa.len; + dup.ms_ra_cap.v = mmctx->ms_radio_access_capa.buf; - /* make sure we only send it to the right llme */ - if (!(msgb_tlli(msg) == mmctx->gb.llme->tlli - || msgb_tlli(msg) == mmctx->gb.llme->old_tlli)) { - LOGP(DLLC, LOGL_ERROR, - "_bssgp_tx_dl_ud(): Attempt to send Downlink Unitdata to wrong LLME:" - " msgb_tlli=0x%x mmctx->gb.llme->tlli=0x%x ->old_tlli=0x%x\n", - msgb_tlli(msg), mmctx->gb.llme->tlli, mmctx->gb.llme->old_tlli); - msgb_free(msg); - return -EINVAL; + /* make sure we only send it to the right llme */ + if (!(msgb_tlli(msg) == mmctx->gb.llme->tlli + || msgb_tlli(msg) == mmctx->gb.llme->old_tlli)) { + LOGP(DLLC, LOGL_ERROR, + "_bssgp_tx_dl_ud(): Attempt to send Downlink Unitdata to wrong LLME:" + " msgb_tlli=0x%x mmctx->gb.llme->tlli=0x%x ->old_tlli=0x%x\n", + msgb_tlli(msg), mmctx->gb.llme->tlli, mmctx->gb.llme->old_tlli); + msgb_free(msg); + return -EINVAL; + } } } memcpy(&dup.qos_profile, qos_profile_default, -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id9fdfb0d88264671546f8dfc4655032ff27bf43e Gerrit-Change-Number: 20203 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:51:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:51:30 +0000 Subject: Change in libosmocore[master]: add osmo_use_count_to_str_c() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20204 ) Change subject: add osmo_use_count_to_str_c() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1d2e7ee979f8c316ef99f7c65675b36d092ddfca Gerrit-Change-Number: 20204 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 09:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:51:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:51:33 +0000 Subject: Change in libosmocore[master]: add osmo_use_count_to_str_c() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20204 ) Change subject: add osmo_use_count_to_str_c() ...................................................................... add osmo_use_count_to_str_c() So far there is only osmo_use_count_name_buf(). Also provide a use count to string using a talloc context, allowing to use OTC_SELECT. - instead of foo_name(), rather use foo_to_str(). - osmo_use_count_name_buf() returns the buf and not the chars_needed. So add osmo_use_count_to_str_buf() with a signature that is usable by OSMO_NAME_C_IMPL(). - provide osmo_use_count_to_str_c() using OSMO_NAME_C_IMPL(). Change-Id: I1d2e7ee979f8c316ef99f7c65675b36d092ddfca --- M include/osmocom/core/use_count.h M src/use_count.c 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/use_count.h b/include/osmocom/core/use_count.h index a019525..cc5493c 100644 --- a/include/osmocom/core/use_count.h +++ b/include/osmocom/core/use_count.h @@ -216,6 +216,8 @@ const char *file, int line); const char *osmo_use_count_name_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc); +int osmo_use_count_to_str_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc); +char *osmo_use_count_to_str_c(void *ctx, const struct osmo_use_count *uc); int32_t osmo_use_count_total(const struct osmo_use_count *uc); int32_t osmo_use_count_by(const struct osmo_use_count *uc, const char *use); diff --git a/src/use_count.c b/src/use_count.c index 453d2ae..738cc5d 100644 --- a/src/use_count.c +++ b/src/use_count.c @@ -107,6 +107,19 @@ */ const char *osmo_use_count_name_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc) { + osmo_use_count_to_str_buf(buf, buf_len, uc); + return buf; +} + +/*! Write a comprehensive listing of use counts to a string buffer. + * Reads like "12 (3*barring,fighting,8*kungfoo)". + * \param[inout] buf Destination buffer. + * \param[in] buf_len sizeof(buf). + * \param[in] uc Use counts to print. + * \return number of bytes that would be written, like snprintf(). + */ +int osmo_use_count_to_str_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc) +{ int32_t count = osmo_use_count_total(uc); struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; struct osmo_use_count_entry *e; @@ -128,7 +141,18 @@ if (first) OSMO_STRBUF_PRINTF(sb, "-"); OSMO_STRBUF_PRINTF(sb, ")"); - return buf; + return sb.chars_needed; +} + +/*! Write a comprehensive listing of use counts to a talloc allocated string buffer. + * Reads like "12 (3*barring,fighting,8*kungfoo)". + * \param[in] ctx talloc pool to allocate from. + * \param[in] uc Use counts to print. + * \return buf, always nul-terminated. + */ +char *osmo_use_count_to_str_c(void *ctx, const struct osmo_use_count *uc) +{ + OSMO_NAME_C_IMPL(ctx, 32, "ERROR", osmo_use_count_to_str_buf, uc) } /* Return a use token's use count entry -- probably you want osmo_use_count_by() instead. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1d2e7ee979f8c316ef99f7c65675b36d092ddfca Gerrit-Change-Number: 20204 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:51:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:51:53 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: fix wrong else-if statement In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20202 ) Change subject: bsc_vty: fix wrong else-if statement ...................................................................... bsc_vty: fix wrong else-if statement Related: CID#214331 Change-Id: I1b0f324a66757278f7c95d25a5192d4234432a6b --- M src/osmo-bsc/bsc_vty.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index b3ea01f..003939b 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5019,7 +5019,8 @@ lchan_t = GSM_LCHAN_TCH_F; else if (lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH && !strcmp(codec_str, "hr")) lchan_t = GSM_LCHAN_TCH_H; - else if ((lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH || GSM_PCHAN_TCH_F_TCH_H_PDCH) + else if ((lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH + || lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH) && !strcmp(codec_str, "fr")) lchan_t = GSM_LCHAN_TCH_F; else { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0f324a66757278f7c95d25a5192d4234432a6b Gerrit-Change-Number: 20202 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:52:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:52:22 +0000 Subject: Change in osmo-sgsn[master]: gmm: on invalid RA id reject the MS with an implicit detach In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20194 ) Change subject: gmm: on invalid RA id reject the MS with an implicit detach ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6a0b335d51f58c26349f7e0a62b2107d7d351d07 Gerrit-Change-Number: 20194 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 09:52:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:52:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:52:24 +0000 Subject: Change in osmo-sgsn[master]: gmm: on invalid RA id reject the MS with an implicit detach In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20194 ) Change subject: gmm: on invalid RA id reject the MS with an implicit detach ...................................................................... gmm: on invalid RA id reject the MS with an implicit detach As long the SGSN doesn't support PS handover treat unknown RA as invalid and do an implicit detach. Fixes ttcn3 crash when an RAU happen within an Attach Request Change-Id: I6a0b335d51f58c26349f7e0a62b2107d7d351d07 --- M src/sgsn/gprs_gmm.c 1 file changed, 20 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 182276c..86545f8 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1663,16 +1663,26 @@ } else if (!gprs_ra_id_equals(&mmctx->ra, &old_ra_id) || mmctx->gmm_fsm->state == ST_GMM_DEREGISTERED) { - /* We cannot use the mmctx */ - LOGMMCTXP(LOGL_INFO, mmctx, - "The MM context cannot be used, RA: %s\n", - osmo_rai_name(&mmctx->ra)); - /* mmctx is set to NULL and gprs_llgmm_unassign(llme) will be - called below, let's make sure we don't keep dangling llme - pointers in mmctx (OS#3957, OS#4245). */ - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) - mmctx->gb.llme = NULL; - mmctx = NULL; + /* We've received either a RAU for a MS which isn't registered + * or a RAU with an unknown RA ID. As long the SGSN doesn't support + * PS handover we treat this as invalid RAU */ + struct gprs_ra_id new_ra_id; + char new_ra[32]; + + bssgp_parse_cell_id(&new_ra_id, msgb_bcid(msg)); + osmo_rai_name_buf(new_ra, sizeof(new_ra), &new_ra_id); + + if (mmctx->gmm_fsm->state == ST_GMM_DEREGISTERED) + LOGMMCTXP(LOGL_INFO, mmctx, + "Rejecting RAU - GMM state is deregistered. Old RA: %s New RA: %s\n", + osmo_rai_name(&old_ra_id), new_ra); + else + LOGMMCTXP(LOGL_INFO, mmctx, + "Rejecting RAU - Old RA doesn't match MM. Old RA: %s New RA: %s\n", + osmo_rai_name(&old_ra_id), new_ra); + + reject_cause = GMM_CAUSE_IMPL_DETACHED; + goto rejected; } if (!mmctx) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6a0b335d51f58c26349f7e0a62b2107d7d351d07 Gerrit-Change-Number: 20194 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:55:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:55:34 +0000 Subject: Change in osmo-e1d[master]: make sure a given timeslot can only be opened once (by default) In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/20081 to look at the new patch set (#2). Change subject: make sure a given timeslot can only be opened once (by default) ...................................................................... make sure a given timeslot can only be opened once (by default) Align the behavior of osmo-e1d with that of DAHDI: If a timeslot is opened once, it cannot be opened again by anyone until it is closed by the current owner. This way we'd have the same failure semantics in DAHDI vs. osmo-e1d, which is very useful in case of misconfiguration when osmo-bsc + osmo-mgw would "fight" over a timeslot. Add a osmo_e1dp_client_ts_open_force() function that allows to override and get back the original behavior. Closes: OS#4654 Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 --- A TODO-RELEASE M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto_clnt.c 5 files changed, 37 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/81/20081/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 Gerrit-Change-Number: 20081 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:56:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:56:46 +0000 Subject: Change in osmo-bsc[master]: oml: Fix premature Opstart to Radio Carrier In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20162 ) Change subject: oml: Fix premature Opstart to Radio Carrier ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If69393551117266ecb726d8961153560b2b3cc59 Gerrit-Change-Number: 20162 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 09:56:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:56:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:56:49 +0000 Subject: Change in osmo-bsc[master]: oml: Fix premature Opstart to Radio Carrier In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20162 ) Change subject: oml: Fix premature Opstart to Radio Carrier ...................................................................... oml: Fix premature Opstart to Radio Carrier During the A-bis/OML bootstrapping, osmo-bsc sends Opstart to the Radio Carrier MO twice. The first Opstart is triggered by the State Changed Event Report, originated by the Radio Carrier itself. The second is triggered by Software Activated Report. According to 3GPP TS 12.21, figure 2, we shall send it only once, after the "Attribute setting" step. Therefore, the first Opstart is premature, and we shall not send it. Related: SYS#5063, OS#4755 Change-Id: If69393551117266ecb726d8961153560b2b3cc59 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bts_ipaccess_nanobts.c 3 files changed, 30 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 952e03c..c7d7fe1 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -73,6 +73,7 @@ S_NM_OM2K_CONF_RES, /* OM2K Configuration Result */ S_NM_OPSTART_ACK, /* Received OPSTART ACK, arg is struct msgb *oml_msg */ S_NM_GET_ATTR_REP, /* Received Get Attributes Response, arg is struct msgb *oml_msg */ + S_NM_SET_RADIO_ATTR_ACK, /* Received Set Radio Carrier Attributes Ack, arg is struct msgb *oml_msg */ }; /* SS_LCHAN signals */ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 7e637df..ec52380 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -821,6 +821,14 @@ return 0; } +static int abis_nm_rx_set_radio_attr_ack(struct msgb *mb) +{ + struct abis_om_fom_hdr *foh = msgb_l3(mb); + DEBUGPFOH(DNM, foh, "Set Radio Carrier Attributes ACK\n"); + osmo_signal_dispatch(SS_NM, S_NM_SET_RADIO_ATTR_ACK, mb); + return 0; +} + bool all_trx_rsl_connected_unlocked(const struct gsm_bts *bts) { const struct gsm_bts_trx *trx; @@ -941,6 +949,7 @@ break; case NM_MT_SET_RADIO_ATTR_ACK: DEBUGPFOH(DNM, foh, "Set Radio Carrier Attributes ACK\n"); + abis_nm_rx_set_radio_attr_ack(mb); break; case NM_MT_CONN_MDROP_LINK_ACK: DEBUGPFOH(DNM, foh, "CONN MDROP LINK ACK\n"); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 49720e5..796d208 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -185,11 +185,7 @@ } break; case NM_OC_RADIO_CARRIER: - trx = obj; - if (new_state->operational == NM_OPSTATE_DISABLED && - new_state->availability == NM_AVSTATE_OK) - abis_nm_opstart(trx->bts, obj_class, trx->bts->bts_nr, - trx->nr, 0xff); + /* OPSTART done after Set Radio Carrier Attributes ACK is received */ break; case NM_OC_GPRS_NSE: bts = container_of(obj, struct gsm_bts, gprs.nse); @@ -285,16 +281,13 @@ * This code is here to make sure that on start * a TRX remains locked. */ - int rc_state = trx->mo.nm_state.administrative; /* Patch ARFCN into radio attribute */ struct msgb *msgb = nanobts_attr_radio_get(trx->bts, trx); abis_nm_set_radio_attr(trx, msgb->data, msgb->len); msgb_free(msgb); abis_nm_chg_adm_state(trx->bts, foh->obj_class, trx->bts->bts_nr, trx->nr, 0xff, - rc_state); - abis_nm_opstart(trx->bts, foh->obj_class, trx->bts->bts_nr, - trx->nr, 0xff); + trx->mo.nm_state.administrative); break; } } @@ -328,6 +321,21 @@ } } +static void nm_rx_set_radio_attr_ack(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 *bts = sign_link->trx->bts; + struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + + if (foh->obj_class != NM_OC_RADIO_CARRIER) { + LOG_TRX(trx, DNM, LOGL_ERROR, "Set Radio Carrier Attr Ack received on non Radio Carrier object!\n"); + return; + } + abis_nm_opstart(trx->bts, foh->obj_class, trx->bts->bts_nr, + trx->nr, 0xff); +} + /* Callback function to be called every time we receive a signal from NM */ static int bts_ipa_nm_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -344,6 +352,9 @@ case S_NM_OPSTART_ACK: nm_rx_opstart_ack(signal_data); return 0; + case S_NM_SET_RADIO_ATTR_ACK: + nm_rx_set_radio_attr_ack(signal_data); + return 0; default: break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If69393551117266ecb726d8961153560b2b3cc59 Gerrit-Change-Number: 20162 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:57:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:57:22 +0000 Subject: Change in libosmocore[master]: vty: add program specific attributes to VTY commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19667 ) Change subject: vty: add program specific attributes to VTY commands ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c6c7b317b2b28ce70784c0cabd1b913e721be02 Gerrit-Change-Number: 19667 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 09:57:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:57:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:57:44 +0000 Subject: Change in libosmocore[master]: vty: add program specific attributes to VTY commands In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19667 ) Change subject: vty: add program specific attributes to VTY commands ...................................................................... vty: add program specific attributes to VTY commands Change-Id: I2c6c7b317b2b28ce70784c0cabd1b913e721be02 Related: SYS#4937 --- M TODO-RELEASE M include/osmocom/vty/command.h M include/osmocom/vty/vty.h 3 files changed, 34 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 3c2a15b..7699aff 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,5 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmogsm new API gsm0808_create_sapi_reject_cause() with cause argument +libosmovty ABI change struct cmd_element: add a field for program specific attributes +libosmovty ABI change struct vty_app_info: optional program specific attributes description diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index da8d202..47d2e5f 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -149,7 +149,8 @@ unsigned int cmdsize; /*!< Command index count. */ char *config; /*!< Configuration string */ vector subconfig; /*!< Sub configuration string */ - unsigned char attr; /*!< Command attributes */ + unsigned char attr; /*!< Command attributes (global) */ + unsigned int usrattr; /*!< Command attributes (program specific) */ }; /*! Command description structure. */ @@ -200,6 +201,16 @@ .daemon = dnum, \ }; +#define DEFUN_CMD_ELEMENT_ATTR_USRATTR(funcname, cmdname, cmdstr, helpstr, attrs, usrattrs) \ + static struct cmd_element cmdname = \ + { \ + .string = cmdstr, \ + .func = funcname, \ + .doc = helpstr, \ + .attr = attrs, \ + .usrattr = usrattrs, \ + }; + #define DEFUN_CMD_FUNC_DECL(funcname) \ static int funcname (struct cmd_element *, struct vty *, int, const char *[]); \ @@ -240,6 +251,22 @@ #define DEFUN_DEPRECATED(funcname, cmdname, cmdstr, helpstr) \ DEFUN_ATTR (funcname, cmdname, cmdstr, helpstr, CMD_ATTR_DEPRECATED) +/*! Macro for defining a VTY node and function with global & program specific attributes. + * \param[in] funcname Name of the function implementing the node. + * \param[in] cmdname Name of the command node. + * \param[in] attr Global attributes (see CMD_ATTR_*). + * \param[in] usrattr Program specific attributes. + * \param[in] cmdstr String with syntax of node. + * \param[in] helpstr String with help message of node. + */ +#define DEFUN_ATTR_USRATTR(funcname, cmdname, attr, usrattr, cmdstr, helpstr) \ + DEFUN_CMD_FUNC_DECL(funcname) \ + DEFUN_CMD_ELEMENT_ATTR_USRATTR(funcname, cmdname, cmdstr, helpstr, attr, usrattr) \ + DEFUN_CMD_FUNC_TEXT(funcname) + +#define DEFUN_USRATTR(funcname, cmdname, usrattr, cmdstr, helpstr) \ + DEFUN_ATTR_USRATTR(funcname, cmdname, 0, usrattr, cmdstr, helpstr) + /* DEFUN_NOSH for commands that vtysh should ignore */ #define DEFUN_NOSH(funcname, cmdname, cmdstr, helpstr) \ DEFUN(funcname, cmdname, cmdstr, helpstr) diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h index b63dc3b..fcef08e 100644 --- a/include/osmocom/vty/vty.h +++ b/include/osmocom/vty/vty.h @@ -192,6 +192,10 @@ " no longer called, ever, and can be left NULL."); /*! Check if the config is consistent before write */ int (*config_is_consistent)(struct vty *vty); + /*! Description of the application specific VTY attributes (optional). */ + const char * usr_attr_desc[32]; + /*! Flag letters of the application specific VTY attributes (optional). */ + char usr_attr_letters[32]; }; /* Prototypes. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c6c7b317b2b28ce70784c0cabd1b913e721be02 Gerrit-Change-Number: 19667 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 09:57:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 09:57:45 +0000 Subject: Change in libosmocore[master]: vty: print program specific attributes in the XML reference In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19668 ) Change subject: vty: print program specific attributes in the XML reference ...................................................................... vty: print program specific attributes in the XML reference Change-Id: I1f35368ba9178e1454f2e3ddfcad9d96576143ef Related: SYS#4937 --- M src/vty/command.c 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/command.c b/src/vty/command.c index 722b3e0..bad2688 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -628,11 +628,36 @@ static int vty_dump_element(struct cmd_element *cmd, print_func_t print_func, void *data, const char *newline) { char *xml_string = xml_escape(cmd->string); + unsigned int i; print_func(data, " %s", xml_string, newline); + + /* Print application specific attributes and their description */ + if (cmd->usrattr != 0x00) { /* ... if at least one flag is set */ + print_func(data, " %s", newline); + + for (i = 0; i < ARRAY_SIZE(host.app_info->usr_attr_desc); i++) { + char *xml_att_desc; + char flag; + + /* Skip attribute if *not* set */ + if (~cmd->usrattr & (1 << i)) + continue; + + xml_att_desc = xml_escape(host.app_info->usr_attr_desc[i]); + print_func(data, " usr_attr_letters[i]) != '\0') + print_func(data, " flag='%c'", flag); + print_func(data, " />%s", newline); + } + + print_func(data, " %s", newline); + } + print_func(data, " %s", newline); - int i; for (i = 0; i < vector_count(cmd->strvec); ++i) { vector descvec = vector_slot(cmd->strvec, i); int j; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1f35368ba9178e1454f2e3ddfcad9d96576143ef Gerrit-Change-Number: 19668 Gerrit-PatchSet: 13 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 10:00:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 10:00:41 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: fix measurement handling for SUB frames In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18035 ) Change subject: osmo-bts-trx/scheduler: fix measurement handling for SUB frames ...................................................................... Patch Set 8: would be great to see this finally addressed, getting close to one month without feedback -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I902bb47d68742d2589156f61099b67a0edbaf40b Gerrit-Change-Number: 18035 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 10:00:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 10:01:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 10:01:17 +0000 Subject: Change in osmo-gsm-tester[master]: enb: incorporate number of carriers into ue_max_rate() API In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955 ) Change subject: enb: incorporate number of carriers into ue_max_rate() API ...................................................................... enb: incorporate number of carriers into ue_max_rate() API this allows the enb to calculate the max rate in a single spot rather than each test individually Change-Id: Id225a986e0b271cf9c057c74c9aefd6c7f3d39d6 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M sysmocom/suites/4g/iperf3_dl.py M sysmocom/suites/4g/iperf3_ul.py 5 files changed, 12 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 85aca35..6384f15 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -213,7 +213,7 @@ pass @abstractmethod - def ue_max_rate(self, downlink=True): + def ue_max_rate(self, downlink=True, num_carriers=1): pass @abstractmethod diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 657cb2e..f2d328d 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -251,7 +251,7 @@ rfemu_obj = rfemu.get_instance_by_type(rfemu_cfg['type'], rfemu_cfg) return rfemu_obj - def ue_max_rate(self, downlink=True): + def ue_max_rate(self, downlink=True, num_carriers=1): # The max rate for a single UE per PRB configuration in TM1 with MCS 28 QAM64 max_phy_rate_tm1_dl = { 6 : 3.2e6, 15 : 9.2e6, @@ -278,6 +278,9 @@ if self._txmode >= 2 and self.num_prb() <= 25: max_rate *= 0.85 + # Assume we schedule all carriers + max_rate *= num_carriers + return max_rate # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index aa2ec87..7556f92 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -249,10 +249,11 @@ rfemu_cfg = cell_list[cell].get('dl_rfemu', None) if rfemu_cfg is None: raise log.Error('rfemu attribute not found in cell_list item!') + rfemu_obj = rfemu.get_instance_by_type(rfemu_cfg['type'], rfemu_cfg) return rfemu_obj - def ue_max_rate(self, downlink=True): + def ue_max_rate(self, downlink=True, num_carriers=1): # The max rate for a single UE per PRB configuration in TM1 with MCS 28 QAM64 max_phy_rate_tm1_dl = { 6 : 3.5e6, 15 : 11e6, @@ -280,6 +281,9 @@ if self._txmode >= 2 and self.num_prb() == 6: max_rate *= 0.85 + # Assume we schedule all carriers + max_rate *= num_carriers + return max_rate # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py index 0d8bfcd..6f79076 100755 --- a/sysmocom/suites/4g/iperf3_dl.py +++ b/sysmocom/suites/4g/iperf3_dl.py @@ -20,8 +20,7 @@ ue.connect(enb) -max_rate = enb.ue_max_rate(downlink=True) -max_rate *= ue.num_carriers +max_rate = enb.ue_max_rate(downlink=True, num_carriers=ue.num_carriers) iperf3srv.start() proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate) diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py index 83ac465..4ae0118 100755 --- a/sysmocom/suites/4g/iperf3_ul.py +++ b/sysmocom/suites/4g/iperf3_ul.py @@ -20,8 +20,7 @@ ue.connect(enb) -max_rate = enb.ue_max_rate(downlink=False) -max_rate *= ue.num_carriers +max_rate = enb.ue_max_rate(downlink=False, num_carriers=ue.num_carriers) iperf3srv.start() proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id225a986e0b271cf9c057c74c9aefd6c7f3d39d6 Gerrit-Change-Number: 19955 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 10:01:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 10:01:17 +0000 Subject: Change in osmo-gsm-tester[master]: enb_srs: expose DL AWGN channel modifier for srsENB In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19956 ) Change subject: enb_srs: expose DL AWGN channel modifier for srsENB ...................................................................... enb_srs: expose DL AWGN channel modifier for srsENB we've added the modifier to configure Amarisoft eNB channel model. This patch enables it for srsENB. Change-Id: I30e65d0431b2d2792986128287caf8b23a22b2c1 --- M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/templates/srsenb.conf.tmpl 2 files changed, 11 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index 7556f92..68a3a19 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -194,6 +194,8 @@ self.enable_pcap = util.str2bool(values['enb'].get('enable_pcap', 'false')) config.overlay(values, dict(enb={'enable_pcap': self.enable_pcap})) + config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))})) + self._additional_args = [] for add_args in values['enb'].get('additional_args', []): self._additional_args += add_args.split() diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl index ac94313..7409b3a 100644 --- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl @@ -193,8 +193,16 @@ # hst.fd_hz: Doppler frequency in Hz # hst.init_time_s: Initial time in seconds ##################################################################### +% if enb.enable_dl_awgn: [channel.dl] -#enable = false +enable = true +% endif + +% if enb.enable_dl_awgn: +[channel.dl.awgn] +enable = true +snr = ${enb.dl_awgn_snr} +% endif [channel.dl.fading] #enable = false -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I30e65d0431b2d2792986128287caf8b23a22b2c1 Gerrit-Change-Number: 19956 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 10:04:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 10:04:12 +0000 Subject: Change in libosmocore[master]: logging: introduce experimental 'systemd-journal' target In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20045 ) Change subject: logging: introduce experimental 'systemd-journal' target ...................................................................... Patch Set 2: does this even build? I don't see any Makefile.ac changes... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I609f5cf438e6ad9038d8fc95f00add6aac29fb23 Gerrit-Change-Number: 20045 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 10:04:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 10:05:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 10:05:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: do not allow as_Media_mgw to exit In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20131 ) Change subject: MSC_ConnectionHandler: do not allow as_Media_mgw to exit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I303879a9153d25a02743dc1d4713ae74918b9be7 Gerrit-Change-Number: 20131 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 20 Sep 2020 10:05:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 10:05:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 20 Sep 2020 10:05:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: do not allow as_Media_mgw to exit In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20131 ) Change subject: MSC_ConnectionHandler: do not allow as_Media_mgw to exit ...................................................................... MSC_ConnectionHandler: do not allow as_Media_mgw to exit The altstep as_handover needs to repeat until the IPACC and the MGCP rtp negotiation is done (MDCX). By setting the norepeat flag of the sub altsteap as_Media_mgw to true, we allow as_handover to exit early, even when the handover is not done yet, which eventually causes the testcase to fail. Change-Id: I303879a9153d25a02743dc1d4713ae74918b9be7 fixes: OS#4752 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 76a56fc..c372709 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -1269,7 +1269,7 @@ } } [st.rr_ho_cmpl_seen] as_Media_ipacc(); - [st.rr_ho_cmpl_seen] as_Media_mgw(true); + [st.rr_ho_cmpl_seen] as_Media_mgw(); [st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I303879a9153d25a02743dc1d4713ae74918b9be7 Gerrit-Change-Number: 20131 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 10:06:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 10:06:58 +0000 Subject: Change in libosmocore[master]: logging: introduce experimental 'systemd-journal' target In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20045 ) Change subject: logging: introduce experimental 'systemd-journal' target ...................................................................... Patch Set 2: (1 comment) > Patch Set 2: > > does this even build? I don't see any Makefile.ac changes... It does. https://gerrit.osmocom.org/c/libosmocore/+/20045/2/src/Makefile.am File src/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/20045/2/src/Makefile.am at 74 PS2, Line 74: if ENABLE_SYSTEMD_LOGGING I am changing this part... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I609f5cf438e6ad9038d8fc95f00add6aac29fb23 Gerrit-Change-Number: 20045 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 20 Sep 2020 10:06:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 22:20:07 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sun, 20 Sep 2020 22:20:07 +0000 Subject: Change in osmo-sgsn[master]: Fix Radio Priority in MM Attach and PDP Context Activation References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 ) Change subject: Fix Radio Priority in MM Attach and PDP Context Activation ...................................................................... Fix Radio Priority in MM Attach and PDP Context Activation 3GPP TS 24.008 Section 10.5.7.2 Radio Priority states that the Radio Priority IE is 3 bits as follows: -------------------------------------------- 0 0 1 priority level 1 (highest) 0 1 0 priority level 2 0 1 1 priority level 3 1 0 0 priority level 4 (lowest) All other values are interpreted as priority level 4 by this version of the protocol. -------------------------------------------- However at least the MediaTek MT6753 and MT6592 have been observed to interpret a value of 0 0 0 in an undetermined way resulting in lack of access to RACH in the cell. Fixes: OS#4506 Change-Id: I810cd541eb5764ee3f2c238bcd3a10836228d0b5 --- M src/sgsn/gprs_gmm.c M src/sgsn/sgsn_libgtp.c 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/17/20217/1 diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 86545f8..bf72cd6 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -302,7 +302,7 @@ aa->att_result = 1; /* GPRS only */ t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); aa->ra_upd_timer = gprs_secs_to_tmr_floor(t); - aa->radio_prio = 4; /* lowest */ + aa->radio_prio = 0x44; /* lowest */ gsm48_encode_ra(&aa->ra_id, &mm->ra); #if 0 diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 581e74d..45a4a07 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -167,6 +167,7 @@ pdp->hisaddr0 = ggsn->remote_addr; pdp->hisaddr1 = ggsn->remote_addr; //pdp->cch_pdp = 512; /* Charging Flat Rate */ + pdp->radio_pri = 0x4; /* MS provided APN, subscription was verified by the caller */ pdp->selmode = 0xFC | 0x00; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I810cd541eb5764ee3f2c238bcd3a10836228d0b5 Gerrit-Change-Number: 20217 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 22:31:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 20 Sep 2020 22:31:28 +0000 Subject: Change in osmo-sgsn[master]: Fix Radio Priority in MM Attach and PDP Context Activation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 ) Change subject: Fix Radio Priority in MM Attach and PDP Context Activation ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/20217/1/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/20217/1/src/sgsn/gprs_gmm.c at 305 PS1, Line 305: 0x44 Why 0x44? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I810cd541eb5764ee3f2c238bcd3a10836228d0b5 Gerrit-Change-Number: 20217 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 20 Sep 2020 22:31:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 20 23:08:48 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sun, 20 Sep 2020 23:08:48 +0000 Subject: Change in osmo-sgsn[master]: Fix Radio Priority in MM Attach and PDP Context Activation In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 ) Change subject: Fix Radio Priority in MM Attach and PDP Context Activation ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/20217/1/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/20217/1/src/sgsn/gprs_gmm.c at 305 PS1, Line 305: 0x44 > Why 0x44? the quick answer, I noted in wireshark two radio priorities here: Radio Priority 2 - Radio priority for TOM8 .100 .... = Radio Priority (TOM8): priority level 4 (lowest) (4) Radio Priority - Radio priority for SMS .... .100 = Radio Priority (PDP or SMS): priority level 4 (lowest) (4) Radio Priority 2 used to be .000 (above is with this patch) - Without following the code too much, but seeing that struct gsm48_attach_ack {...} has only one field for radio_prio, I guessed that this uint8_t corresponds to both and that the intention is that 'TOM8' should also be priority 4, best to set it seeing as how the MTK does not like this IE being 000 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I810cd541eb5764ee3f2c238bcd3a10836228d0b5 Gerrit-Change-Number: 20217 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Sun, 20 Sep 2020 23:08:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Sep 21 01:38:18 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 21 Sep 2020 01:38:18 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f68041214f5f_61f2b0a440665fc10236e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 149s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 149s] [COMPILING libboard/qmod/source/card_pres.c] [ 149s] [COMPILING libboard/qmod/source/wwan_led.c] [ 149s] [COMPILING libboard/qmod/source/i2c.c] [ 149s] [COMPILING libboard/qmod/source/board_qmod.c] [ 150s] [COMPILING apps/dfu/main.c] [ 150s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 150s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 150s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 150s] Memory region Used Size Region Size %age Used [ 150s] rom: 16588 B 16 KB 101.25% [ 150s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 150s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 150s] collect2: error: ld returned 1 exit status [ 150s] % [ 150s] make[2]: *** [Makefile:234: flash] Error 1 [ 150s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 150s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 150s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 150s] dh_auto_build: error: make -j1 returned exit code 2 [ 150s] make: *** [debian/rules:16: build] Error 25 [ 150s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 150s] ### VM INTERACTION START ### [ 153s] [ 142.976846] sysrq: Power Off [ 153s] [ 142.982865] reboot: Power down [ 154s] ### VM INTERACTION END ### [ 154s] [ 154s] cloud124 failed "build simtrace2_0.7.0.63.39070.dsc" at Mon Sep 21 01:38:10 UTC 2020. [ 154s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Sep 21 03:10:54 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 21 Sep 2020 03:10:54 +0000 Subject: Change in docker-playground[master]: PCU+SGSN tests: Set address_family field of NSConfiguration In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20190 ) Change subject: PCU+SGSN tests: Set address_family field of NSConfiguration ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I52e8b11f047a7a2ecce18e4a4f9ff3ed495a0352 Gerrit-Change-Number: 20190 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 03:10:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 06:32:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 06:32:18 +0000 Subject: Change in osmo-sgsn[master]: Fix Radio Priority in MM Attach and PDP Context Activation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 ) Change subject: Fix Radio Priority in MM Attach and PDP Context Activation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I810cd541eb5764ee3f2c238bcd3a10836228d0b5 Gerrit-Change-Number: 20217 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 21 Sep 2020 06:32:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 06:32:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 06:32:21 +0000 Subject: Change in osmo-sgsn[master]: Fix Radio Priority in MM Attach and PDP Context Activation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 ) Change subject: Fix Radio Priority in MM Attach and PDP Context Activation ...................................................................... Fix Radio Priority in MM Attach and PDP Context Activation 3GPP TS 24.008 Section 10.5.7.2 Radio Priority states that the Radio Priority IE is 3 bits as follows: -------------------------------------------- 0 0 1 priority level 1 (highest) 0 1 0 priority level 2 0 1 1 priority level 3 1 0 0 priority level 4 (lowest) All other values are interpreted as priority level 4 by this version of the protocol. -------------------------------------------- However at least the MediaTek MT6753 and MT6592 have been observed to interpret a value of 0 0 0 in an undetermined way resulting in lack of access to RACH in the cell. Fixes: OS#4506 Change-Id: I810cd541eb5764ee3f2c238bcd3a10836228d0b5 --- M src/sgsn/gprs_gmm.c M src/sgsn/sgsn_libgtp.c 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 86545f8..bf72cd6 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -302,7 +302,7 @@ aa->att_result = 1; /* GPRS only */ t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); aa->ra_upd_timer = gprs_secs_to_tmr_floor(t); - aa->radio_prio = 4; /* lowest */ + aa->radio_prio = 0x44; /* lowest */ gsm48_encode_ra(&aa->ra_id, &mm->ra); #if 0 diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 581e74d..45a4a07 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -167,6 +167,7 @@ pdp->hisaddr0 = ggsn->remote_addr; pdp->hisaddr1 = ggsn->remote_addr; //pdp->cch_pdp = 512; /* Charging Flat Rate */ + pdp->radio_pri = 0x4; /* MS provided APN, subscription was verified by the caller */ pdp->selmode = 0xFC | 0x00; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I810cd541eb5764ee3f2c238bcd3a10836228d0b5 Gerrit-Change-Number: 20217 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 06:39:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 06:39:04 +0000 Subject: Change in docker-playground[master]: PCU+SGSN tests: Set address_family field of NSConfiguration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20190 ) Change subject: PCU+SGSN tests: Set address_family field of NSConfiguration ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I52e8b11f047a7a2ecce18e4a4f9ff3ed495a0352 Gerrit-Change-Number: 20190 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 06:39:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 06:39:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 06:39:07 +0000 Subject: Change in docker-playground[master]: PCU+SGSN tests: Set address_family field of NSConfiguration In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20190 ) Change subject: PCU+SGSN tests: Set address_family field of NSConfiguration ...................................................................... PCU+SGSN tests: Set address_family field of NSConfiguration In osmo-ttcn3-hacks Change-Id I0b4fda96accef401ffc009010f9f5621583fd6dd we introduce the address_family member; let's make sure all configs use it as expected. Change-Id: I52e8b11f047a7a2ecce18e4a4f9ff3ed495a0352 --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/sns/PCU_Tests.cfg M ttcn3-sgsn-test/SGSN_Tests.cfg 3 files changed, 5 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved lynxis lazus: Looks good to me, approved laforge: Verified diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 17ab6c6..92f5d8a 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -11,6 +11,7 @@ [MODULE_PARAMETERS] PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts" SGSN_Components.mp_nsconfig := { + address_family := AF_INET, local_ip := "172.18.13.10", local_udp_port := 23000, remote_ip := "172.18.13.101", diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index 60f375b..f441d18 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -9,6 +9,7 @@ [MODULE_PARAMETERS] PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts" SGSN_Components.mp_nsconfig := { + address_family := AF_INET, local_ip := "172.18.14.10", local_udp_port := 23000, remote_ip := "172.18.14.101", diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index f7d6d9a..055ae5a 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -14,14 +14,17 @@ [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { { + address_family := AF_INET, local_ip := "172.18.8.103", remote_ip := "172.18.8.10" }, { + address_family := AF_INET, local_ip := "172.18.8.103", remote_ip := "172.18.8.10" }, { + address_family := AF_INET, local_ip := "172.18.8.103", remote_ip := "172.18.8.10" } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I52e8b11f047a7a2ecce18e4a4f9ff3ed495a0352 Gerrit-Change-Number: 20190 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 06:39:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 06:39:55 +0000 Subject: Change in libosmocore[master]: logging: introduce experimental 'systemd-journal' target In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20045 ) Change subject: logging: introduce experimental 'systemd-journal' target ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I609f5cf438e6ad9038d8fc95f00add6aac29fb23 Gerrit-Change-Number: 20045 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 06:39:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 09:20:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 09:20:18 +0000 Subject: Change in osmo-mgw[master]: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20218 ) Change subject: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param ...................................................................... mgw: Don't be case-sensitive when parsing X-Osmo-IGN param Some implementations like our TTCN3 encoder set all param characters in caps. Related: SYS#5063 Change-Id: Ie4bc5e86551c55021ca6ca2fbc6fc56a26f5fb16 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/20218/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 4c00140..97c6d3f 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -707,7 +707,7 @@ { char *saveptr = NULL; - if (strncmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) + if (strncasecmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) return false; line += strlen(MGCP_X_OSMO_IGN_HEADER); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie4bc5e86551c55021ca6ca2fbc6fc56a26f5fb16 Gerrit-Change-Number: 20218 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 09:20:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 09:20:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmo_ign References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 ) Change subject: mgw: Introduce test TC_crcx_osmo_ign ...................................................................... mgw: Introduce test TC_crcx_osmo_ign Related: SYS#5063 Change-Id: I79415c385e89fe859854430bb20940f078fccea0 --- M library/MGCP_Templates.ttcn M library/MGCP_Types.ttcn M mgw/MGCP_Test.ttcn 3 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/20219/1 diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index 79d9670..917ef89 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -55,6 +55,12 @@ val := f_mgcp_osmux_cid_encode(osmux_cid) }; + /* Osmocom extension: X-Osmux: {*,%u} */ + template MgcpParameter t_MgcpParOsmoIGN(template charstring val) := { + code := "X-OSMO-IGN", + val := val + }; + /* osmo-bsc_mgcp implements L/C/M/X only, osmo-mgw adds 'I' */ /* SDP: osmo-bsc_mgcp implements Tx of v,o,s,c,t,m,a */ diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn index b56734c..01d4d3a 100644 --- a/library/MGCP_Types.ttcn +++ b/library/MGCP_Types.ttcn @@ -30,8 +30,8 @@ type charstring MgcpInfoCode ("B", "C", "I", "N", "X", "L", "M", "R", "S", "D", "O", "P", "E", "Z", "Q", "T", "RC", "LC", "A", "ES", "RM", "RD", "PL", - "MD", "X-OSMO-CP", "X-OSMUX") with { - variant "TEXT_CODING(,convert=upper_case,'([BCINXLMRSDOPEZQTA])|(RC)|(LC)|(ES)|(RM)|(RD)|(PL)|(MD)|(X-OSMO-CP)|(X-OSMUX)',case_insensitive)" + "MD", "X-OSMO-CP", "X-OSMO-IGN", "X-OSMUX") with { + variant "TEXT_CODING(,convert=upper_case,'([BCINXLMRSDOPEZQTA])|(RC)|(LC)|(ES)|(RM)|(RD)|(PL)|(MD)|(X-OSMO-CP)|(X-OSMO-IGN)|(X-OSMUX)',case_insensitive)" }; /* 3.2.2.6 */ diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 4be034b..f6dfe57 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -732,6 +732,35 @@ setverdict(pass); } + /* Test CRCX with X-Osmo-IGN, using same message as SYS#5063 to make sure it doesn't cause a crash. */ + testcase TC_crcx_osmo_ign() runs on dummy_CT { + var template MgcpCommand cmd; + var MgcpResponse resp; + var MgcpEndpoint ep := "7@" & c_mgw_domain; + var MgcpCallId call_id := '3'H; + + f_init(ep); + + /* CRCX 1 7 at mgw MGCP 1.0 + C: 3 + L: p:20, a:GSM-EFR, nt:IN + M: recvonly + X-Osmo-IGN: C + */ + + cmd := ts_CRCX(get_next_trans_id(), ep, "netwtest", call_id); + cmd.params := {ts_MgcpParCallId(call_id), + t_MgcpParLocConnOpt("p:20, a:GSM-EFR, nt:IN"), + t_MgcpParConnMode("recvonly"), + t_MgcpParOsmoIGN("C")}; + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); + extract_conn_id(resp); + + /* clean-up */ + f_dlcx_ok(ep, call_id); + setverdict(pass); + } + /* test CRCX with early bi-directional mode, expect 527 as * bi-diretional media can only be established once both local and * remote side are specified, see MGCP RFC */ @@ -2360,6 +2389,7 @@ execute(TC_crcx_no_lco()); execute(TC_crcx_noprefix()); execute(TC_crcx_unsupp_mode()); + execute(TC_crcx_osmo_ign()); execute(TC_crcx_early_bidir_mode()); execute(TC_crcx_unsupp_param()); execute(TC_crcx_missing_callid()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79415c385e89fe859854430bb20940f078fccea0 Gerrit-Change-Number: 20219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 09:25:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 09:25:25 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20220 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I87894dc710823226c1891c919a11ea32c326d3b9 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/20220/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 97c6d3f..5523761 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -550,7 +550,7 @@ lco->pkt_period_max = lco->pkt_period_min; break; case 'a': - /* FIXME: LCO also supports the negotiation of more then one codec. + /* FIXME: LCO also supports the negotiation of more than one codec. * (e.g. a:PCMU;G726-32) But this implementation only supports a single * codec only. */ if (sscanf(lco_id + 1, ":%16[^,]", codec) == 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87894dc710823226c1891c919a11ea32c326d3b9 Gerrit-Change-Number: 20220 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 09:52:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 09:52:18 +0000 Subject: Change in osmo-mgw[master]: mgw: Avoid logging notice message each time we receive nt param in LCO References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20221 ) Change subject: mgw: Avoid logging notice message each time we receive nt param in LCO ...................................................................... mgw: Avoid logging notice message each time we receive nt param in LCO We don't really use it so far and it doesn't server a NOTICE message. Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/20221/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 5523761..902c079 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -524,6 +524,7 @@ { char *lco_id; char codec[17]; + char nt[17]; int len; if (!options) @@ -562,6 +563,10 @@ osmo_str_toupper_buf(lco->codec, len + 1, codec); } break; + case 'n': + if (lco_id[1] == 't' && sscanf(lco_id + 2, ":%16[^,]", nt) == 1) + break; + /* else: fall throught to print notice log */ default: LOGP(DLMGCP, LOGL_NOTICE, "LCO: unhandled option: '%c'/%d in \"%s\"\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:18:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 10:18:55 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix return value documentation for API mgcp_verify_call_id References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20222 ) Change subject: mgw: Fix return value documentation for API mgcp_verify_call_id ...................................................................... mgw: Fix return value documentation for API mgcp_verify_call_id Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/22/20222/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 2023a68..4242d3d 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -245,7 +245,7 @@ /*! Check if the specified callid seems plausible. * \param[in] endp pointer to endpoint * \param{in] callid to verify - * \returns 1 when callid seems plausible, 0 on error */ + * \returns 0 when callid seems plausible, -1 on error */ int mgcp_verify_call_id(struct mgcp_endpoint *endp, const char *callid) { /*! This function compares the supplied callid with the called that is -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 Gerrit-Change-Number: 20222 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:20:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 10:20:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 ) Change subject: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers ...................................................................... pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers This change will facilitate adding test cases for multi-slot TBF allocation across several TS and/or TRX instances of a BTS. Change-Id: I9bff9e912bf73ad6259946a6ea5b08f3e2f728c8 Related: OS#4756 --- M pcu/GPRS_Components.ttcn 1 file changed, 84 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/20223/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index ee2c38f..2807b92 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -44,6 +44,32 @@ import from Native_Functions all; import from SGSN_Components all; +type record TsTrxBtsNum { + uint3_t ts_nr, + uint3_t trx_nr, + uint8_t bts_nr, + uint8_t blk_nr +}; + +template (value) TsTrxBtsNum ts_TsTrxBtsNum(uint3_t ts_nr := 7, + uint3_t trx_nr := 0, + uint8_t bts_nr := 0, + uint8_t blk_nr := 0) := { + ts_nr := ts_nr, + trx_nr := trx_nr, + bts_nr := bts_nr, + blk_nr := blk_nr +}; +template TsTrxBtsNum tr_TsTrxBtsNum(template uint3_t ts_nr := ?, + template uint3_t trx_nr := ?, + template uint8_t bts_nr := ?, + template uint8_t blk_nr := ?) := { + ts_nr := ts_nr, + trx_nr := trx_nr, + bts_nr := bts_nr, + blk_nr := blk_nr +}; + type union PacketDlAssignChan { PacketDlAssign ccch, PacketDlAssignment pacch @@ -281,12 +307,13 @@ } function f_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, - template RlcmacDlBlock t_pkt_ass := ?) + template RlcmacDlBlock t_pkt_ass := ?, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return RlcmacDlBlock { var RlcmacDlBlock dl_block; var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (not match(dl_block, t_pkt_ass)) { setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass); f_shutdown(__BFILE__, __LINE__); @@ -311,30 +338,34 @@ return dl_block; } -function f_ms_establish_ul_tbf(inout GprsMS ms) +function f_ms_establish_ul_tbf(inout GprsMS ms, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var GsmRrMessage rr_imm_ass; - rr_imm_ass := f_pcuif_tx_rach_rx_imm_ass(ms.ra, ms.ra_is_11bit, ms.burst_type, ms.ta); + rr_imm_ass := f_pcuif_tx_rach_rx_imm_ass(ms.ra, ms.ra_is_11bit, ms.burst_type, ms.ta, nr := nr); ms.ul_tbf := f_ultbf_new_from_rr_imm_ass(rr_imm_ass); } function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, - template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?)) + template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?), + template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var GsmRrMessage rr_imm_ass; - rr_imm_ass := f_pcuif_rx_imm_ass(sapi, t_imm_ass); + rr_imm_ass := f_pcuif_rx_imm_ass(sapi, t_imm_ass, nr := nr); ms.dl_tbf := f_dltbf_new_from_rr_imm_ass(rr_imm_ass, tr_PacketDlAssign(ms.tlli)); } /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ -function f_ms_tx_data_ind(inout GprsMS ms, octetstring data, uint32_t fn := 0) +function f_ms_tx_data_ind(inout GprsMS ms, octetstring data, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { - f_pcuif_tx_data_ind(data, ms.lqual_cb, fn); + f_pcuif_tx_data_ind(data, ms.lqual_cb, fn, nr := nr); } -function f_ms_tx_ul_block(inout GprsMS ms, template (value) RlcmacUlBlock ul_data, uint32_t fn := 0, template (omit) CodingScheme force_cs_mcs := omit) +function f_ms_tx_ul_block(inout GprsMS ms, template (value) RlcmacUlBlock ul_data, + uint32_t fn := 0, template (omit) CodingScheme force_cs_mcs := omit, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return integer { var octetstring data; var integer padding_len; @@ -362,12 +393,14 @@ data := f_pad_oct(data, cs_mcs_len, '00'O); /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ - f_ms_tx_data_ind(ms, data, fn); + f_ms_tx_data_ind(ms, data, fn, nr := nr); return padding_len; } /* FIXME: Only supports sending CS-1 so far */ -function f_ms_tx_ul_data_block(inout GprsMS ms, octetstring payload, uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0) +function f_ms_tx_ul_data_block(inout GprsMS ms, octetstring payload, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return integer { var template (value) RlcmacUlBlock ul_data; ul_data := t_RLCMAC_UL_DATA(tfi := ms.ul_tbf.tfi, @@ -379,11 +412,12 @@ ul_data.data.tlli := ms.tlli; } f_ultbf_inc_bsn(ms.ul_tbf); - return f_ms_tx_ul_block(ms, ul_data, fn); + return f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); } /* Send random payload for last "num_blocks" blocks in Ul TBF (ending with CV=0). */ -function f_ms_tx_ul_data_block_multi(inout GprsMS ms, integer num_blocks := 1, boolean with_tlli := false) +function f_ms_tx_ul_data_block_multi(inout GprsMS ms, integer num_blocks := 1, boolean with_tlli := false, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return octetstring { var octetstring total_payload := ''O; @@ -395,7 +429,7 @@ if (cv > g_bs_cv_max) { cv := 15; } - padding_len := f_ms_tx_ul_data_block(ms, payload, cv := cv, with_tlli := with_tlli) + padding_len := f_ms_tx_ul_data_block(ms, payload, cv := cv, with_tlli := with_tlli, nr := nr); total_payload := total_payload & payload & f_pad_oct(''O, padding_len, '00'O); } return total_payload; @@ -494,11 +528,12 @@ } //////////////////////// -// OLD APIs +// Low level APIs //////////////////////// function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, - template GsmRrMessage t_imm_ass := ?) + template GsmRrMessage t_imm_ass := ?, + template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var GsmRrMessage rr_imm_ass; var PCUIF_Message pcu_msg; @@ -507,7 +542,7 @@ T.start(2.0); alt { - [] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, + [] BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, ts_nr := 0, sapi := sapi, data := ?)) -> value pcu_msg { /* On PCH the payload is prefixed with paging group (3 octets): skip it. * TODO: add an additional template parameter, so we can match it. */ @@ -549,7 +584,8 @@ function f_pcuif_tx_rach_rx_imm_ass(uint16_t ra := bit2int(chan_req_def), uint8_t is_11bit := 0, PCUIF_BurstType burst_type := BURST_TYPE_0, - TimingAdvance ta := 0) + TimingAdvance ta := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var uint32_t fn; @@ -558,7 +594,7 @@ /* Send RACH.ind */ log("Sending RACH.ind on fn=", fn, " with RA=", ra, ", TA=", ta); - BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0, + BTS.send(ts_PCUIF_RACH_IND(nr.bts_nr, nr.trx_nr, ts_nr := 0, ra := ra, is_11bit := is_11bit, burst_type := burst_type, fn := fn, arfcn := 871, @@ -569,15 +605,16 @@ * we assume that 11 bit RA always contains EGPRS Packet Channel Request. */ if (is_11bit != 0) { ra := 127; } - /* Expect Immediate (TBF) Assignment on TS0/AGCH */ - return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH, tr_IMM_TBF_ASS(false, ra, fn)); + /* Expect Immediate (TBF) Assignment on the same TS/TRX/BTS */ + return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH, tr_IMM_TBF_ASS(false, ra, fn), nr); } /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ -function f_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0, uint32_t fn := 0) +function f_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var template RAW_PCU_EventParam ev_param := {tdma_fn := ? }; - BTS.send(ts_PCUIF_DATA_IND(bts_nr := 0, trx_nr := 0, ts_nr := 7, block_nr := 0, + BTS.send(ts_PCUIF_DATA_IND(nr.bts_nr, nr.trx_nr, nr.ts_nr, nr.blk_nr, sapi := PCU_IF_SAPI_PDTCH, data := data, fn := fn, arfcn := 871, lqual_cb := lqual_cb)); if (fn != 0) { @@ -587,18 +624,20 @@ } /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ -function f_pcuif_rx_data_req(out PCUIF_Message pcu_msg) +function f_pcuif_rx_data_req(out PCUIF_Message pcu_msg, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { - BTS.send(ts_PCUIF_RTS_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 7, + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, - arfcn := 871, block_nr := 0)); - BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 7, + arfcn := 871, block_nr := nr.blk_nr)); + BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg; } /* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ function f_pcuif_rx_pch_pag_req1(template MobileIdentityV mi1 := ?, - template integer pag_group := ?) + template integer pag_group := ?, + template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var GsmRrMessage rr_pag_req1; var PCUIF_Message pcu_msg; @@ -606,7 +645,7 @@ var integer pag_group_rx; var octetstring macblock; - BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, + BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PCH)) -> value pcu_msg; /* First 3 bytes contain IMSI suffix to calculate paging group: */ @@ -633,10 +672,12 @@ return rr_pag_req1; } -function f_rx_rlcmac_dl_block(out RlcmacDlBlock dl_block, out uint32_t dl_fn, template (present) CodingScheme exp_cs_mcs := ?) +function f_rx_rlcmac_dl_block(out RlcmacDlBlock dl_block, out uint32_t dl_fn, + template (present) CodingScheme exp_cs_mcs := ?, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var PCUIF_Message pcu_msg; - f_pcuif_rx_data_req(pcu_msg); + f_pcuif_rx_data_req(pcu_msg, nr := nr); dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data); dl_fn := pcu_msg.u.data_req.fn; @@ -650,11 +691,12 @@ function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block, out uint32_t poll_fn, template RlcmacDlBlock acknack_tmpl := (tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?), - tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?))) + tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?)), + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (match(dl_block, acknack_tmpl)) { poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp); return; @@ -663,22 +705,24 @@ f_shutdown(__BFILE__, __LINE__); } -function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block) +function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { setverdict(fail, "Failed to match Packet DUMMY DL"); f_shutdown(__BFILE__, __LINE__); } } -function f_rx_rlcmac_dl_block_exp_pkt_pag_req(out RlcmacDlBlock dl_block) +function f_rx_rlcmac_dl_block_exp_pkt_pag_req(out RlcmacDlBlock dl_block, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (not match(dl_block, tr_RLCMAC_PACKET_PAG_REQ())) { setverdict(fail, "Failed to match Packet Paging Request: ", dl_block, " vs ", tr_RLCMAC_PACKET_PAG_REQ()); f_shutdown(__BFILE__, __LINE__); @@ -754,13 +798,14 @@ function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t dl_fn, template (present) octetstring data := ?, template (present) uint7_t exp_bsn := ?, - template (present) CodingScheme exp_cs := ?) + template (present) CodingScheme exp_cs := ?, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { /* FIXME: ideally we should use an alt statement with timeout here, rather than * having +100500 layers of abstraction. This would facilitate developing the * multi-TBF/-TRX/-BTS tests, where you cannot expect that the first received * block is exactly what you need. */ - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); /* Make sure it's either GPRS or EGPRS data block */ if (not match(dl_block, tr_RLCMAC_DATA)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9bff9e912bf73ad6259946a6ea5b08f3e2f728c8 Gerrit-Change-Number: 20223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:29:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 10:29:43 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20224 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/24/20224/1 diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index ecb2845..9ebdd8e 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -641,8 +641,7 @@ OSMO_ASSERT(false); } - /* Make sure the endpoint is released when claiming the endpoint - * failes. */ + /* Make sure the endpoint is released when claiming the endpoint fails. */ if (rc < 0) mgcp_endp_release(endp); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 Gerrit-Change-Number: 20224 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:29:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 10:29:52 +0000 Subject: Change in osmo-mgw[master]: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20218 ) Change subject: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie4bc5e86551c55021ca6ca2fbc6fc56a26f5fb16 Gerrit-Change-Number: 20218 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 10:29:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:30:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 10:30:02 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20220 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87894dc710823226c1891c919a11ea32c326d3b9 Gerrit-Change-Number: 20220 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 10:30:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:32:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 10:32:03 +0000 Subject: Change in osmo-mgw[master]: mgw: Avoid logging notice message each time we receive nt param in LCO In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20221 ) Change subject: mgw: Avoid logging notice message each time we receive nt param in LCO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 10:32:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:32:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 10:32:51 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix return value documentation for API mgcp_verify_call_id In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20222 ) Change subject: mgw: Fix return value documentation for API mgcp_verify_call_id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 Gerrit-Change-Number: 20222 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 10:32:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:33:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 10:33:07 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20224 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 Gerrit-Change-Number: 20224 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 10:33:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:37:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 10:37:09 +0000 Subject: Change in osmo-msc[master]: Don't Store an SMS in the database when the ESME is not Bound In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19935 ) Change subject: Don't Store an SMS in the database when the ESME is not Bound ...................................................................... Patch Set 1: Code-Review+1 I am not familiar with SMPP specifics, but if this change makes it work better for you, I am happy to give CR+1. Feel free to CR+2 and merge. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Gerrit-Change-Number: 19935 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 10:37:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:46:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 10:46:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 ) Change subject: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223/1/pcu/GPRS_Components.ttcn File pcu/GPRS_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223/1/pcu/GPRS_Components.ttcn at 531 PS1, Line 531: // Low level APIs Not really related to this change (besides any related discussion on the topic we could have). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9bff9e912bf73ad6259946a6ea5b08f3e2f728c8 Gerrit-Change-Number: 20223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 10:46:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 10:57:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 10:57:24 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 to look at the new patch set (#2). Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 --- M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_msg.c 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/24/20224/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 Gerrit-Change-Number: 20224 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 11:57:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 11:57:44 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20224 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 Gerrit-Change-Number: 20224 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 21 Sep 2020 11:57:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 11:57:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 11:57:59 +0000 Subject: Change in osmo-mgw[master]: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20218 ) Change subject: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie4bc5e86551c55021ca6ca2fbc6fc56a26f5fb16 Gerrit-Change-Number: 20218 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 21 Sep 2020 11:57:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 11:58:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 11:58:10 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20220 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87894dc710823226c1891c919a11ea32c326d3b9 Gerrit-Change-Number: 20220 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 21 Sep 2020 11:58:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 11:59:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 11:59:27 +0000 Subject: Change in osmo-mgw[master]: mgw: Avoid logging notice message each time we receive nt param in LCO In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20221 ) Change subject: mgw: Avoid logging notice message each time we receive nt param in LCO ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/20221/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/20221/1//COMMIT_MSG at 9 PS1, Line 9: server server? you mean justify? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 21 Sep 2020 11:59:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 11:59:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 11:59:48 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix return value documentation for API mgcp_verify_call_id In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20222 ) Change subject: mgw: Fix return value documentation for API mgcp_verify_call_id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 Gerrit-Change-Number: 20222 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 21 Sep 2020 11:59:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 11:59:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 11:59:58 +0000 Subject: Change in osmo-mgw[master]: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20218 ) Change subject: mgw: Don't be case-sensitive when parsing X-Osmo-IGN param ...................................................................... mgw: Don't be case-sensitive when parsing X-Osmo-IGN param Some implementations like our TTCN3 encoder set all param characters in caps. Related: SYS#5063 Change-Id: Ie4bc5e86551c55021ca6ca2fbc6fc56a26f5fb16 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 4c00140..97c6d3f 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -707,7 +707,7 @@ { char *saveptr = NULL; - if (strncmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) + if (strncasecmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) return false; line += strlen(MGCP_X_OSMO_IGN_HEADER); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie4bc5e86551c55021ca6ca2fbc6fc56a26f5fb16 Gerrit-Change-Number: 20218 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 11:59:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 11:59:59 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20220 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I87894dc710823226c1891c919a11ea32c326d3b9 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 97c6d3f..5523761 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -550,7 +550,7 @@ lco->pkt_period_max = lco->pkt_period_min; break; case 'a': - /* FIXME: LCO also supports the negotiation of more then one codec. + /* FIXME: LCO also supports the negotiation of more than one codec. * (e.g. a:PCMU;G726-32) But this implementation only supports a single * codec only. */ if (sscanf(lco_id + 1, ":%16[^,]", codec) == 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I87894dc710823226c1891c919a11ea32c326d3b9 Gerrit-Change-Number: 20220 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:01:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 12:01:08 +0000 Subject: Change in osmo-bsc[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19670 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51 Gerrit-Change-Number: 19670 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-Comment-Date: Mon, 21 Sep 2020 12:01:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:01:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 12:01:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 ) Change subject: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9bff9e912bf73ad6259946a6ea5b08f3e2f728c8 Gerrit-Change-Number: 20223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 12:01:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:01:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 12:01:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 ) Change subject: pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers ...................................................................... pcu/GPRS_Components: allow passing/matching of TS/TRX/BTS/BLK numbers This change will facilitate adding test cases for multi-slot TBF allocation across several TS and/or TRX instances of a BTS. Change-Id: I9bff9e912bf73ad6259946a6ea5b08f3e2f728c8 Related: OS#4756 --- M pcu/GPRS_Components.ttcn 1 file changed, 84 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index ee2c38f..2807b92 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -44,6 +44,32 @@ import from Native_Functions all; import from SGSN_Components all; +type record TsTrxBtsNum { + uint3_t ts_nr, + uint3_t trx_nr, + uint8_t bts_nr, + uint8_t blk_nr +}; + +template (value) TsTrxBtsNum ts_TsTrxBtsNum(uint3_t ts_nr := 7, + uint3_t trx_nr := 0, + uint8_t bts_nr := 0, + uint8_t blk_nr := 0) := { + ts_nr := ts_nr, + trx_nr := trx_nr, + bts_nr := bts_nr, + blk_nr := blk_nr +}; +template TsTrxBtsNum tr_TsTrxBtsNum(template uint3_t ts_nr := ?, + template uint3_t trx_nr := ?, + template uint8_t bts_nr := ?, + template uint8_t blk_nr := ?) := { + ts_nr := ts_nr, + trx_nr := trx_nr, + bts_nr := bts_nr, + blk_nr := blk_nr +}; + type union PacketDlAssignChan { PacketDlAssign ccch, PacketDlAssignment pacch @@ -281,12 +307,13 @@ } function f_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, - template RlcmacDlBlock t_pkt_ass := ?) + template RlcmacDlBlock t_pkt_ass := ?, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return RlcmacDlBlock { var RlcmacDlBlock dl_block; var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (not match(dl_block, t_pkt_ass)) { setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass); f_shutdown(__BFILE__, __LINE__); @@ -311,30 +338,34 @@ return dl_block; } -function f_ms_establish_ul_tbf(inout GprsMS ms) +function f_ms_establish_ul_tbf(inout GprsMS ms, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var GsmRrMessage rr_imm_ass; - rr_imm_ass := f_pcuif_tx_rach_rx_imm_ass(ms.ra, ms.ra_is_11bit, ms.burst_type, ms.ta); + rr_imm_ass := f_pcuif_tx_rach_rx_imm_ass(ms.ra, ms.ra_is_11bit, ms.burst_type, ms.ta, nr := nr); ms.ul_tbf := f_ultbf_new_from_rr_imm_ass(rr_imm_ass); } function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, - template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?)) + template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?), + template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var GsmRrMessage rr_imm_ass; - rr_imm_ass := f_pcuif_rx_imm_ass(sapi, t_imm_ass); + rr_imm_ass := f_pcuif_rx_imm_ass(sapi, t_imm_ass, nr := nr); ms.dl_tbf := f_dltbf_new_from_rr_imm_ass(rr_imm_ass, tr_PacketDlAssign(ms.tlli)); } /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ -function f_ms_tx_data_ind(inout GprsMS ms, octetstring data, uint32_t fn := 0) +function f_ms_tx_data_ind(inout GprsMS ms, octetstring data, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { - f_pcuif_tx_data_ind(data, ms.lqual_cb, fn); + f_pcuif_tx_data_ind(data, ms.lqual_cb, fn, nr := nr); } -function f_ms_tx_ul_block(inout GprsMS ms, template (value) RlcmacUlBlock ul_data, uint32_t fn := 0, template (omit) CodingScheme force_cs_mcs := omit) +function f_ms_tx_ul_block(inout GprsMS ms, template (value) RlcmacUlBlock ul_data, + uint32_t fn := 0, template (omit) CodingScheme force_cs_mcs := omit, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return integer { var octetstring data; var integer padding_len; @@ -362,12 +393,14 @@ data := f_pad_oct(data, cs_mcs_len, '00'O); /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ - f_ms_tx_data_ind(ms, data, fn); + f_ms_tx_data_ind(ms, data, fn, nr := nr); return padding_len; } /* FIXME: Only supports sending CS-1 so far */ -function f_ms_tx_ul_data_block(inout GprsMS ms, octetstring payload, uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0) +function f_ms_tx_ul_data_block(inout GprsMS ms, octetstring payload, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return integer { var template (value) RlcmacUlBlock ul_data; ul_data := t_RLCMAC_UL_DATA(tfi := ms.ul_tbf.tfi, @@ -379,11 +412,12 @@ ul_data.data.tlli := ms.tlli; } f_ultbf_inc_bsn(ms.ul_tbf); - return f_ms_tx_ul_block(ms, ul_data, fn); + return f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); } /* Send random payload for last "num_blocks" blocks in Ul TBF (ending with CV=0). */ -function f_ms_tx_ul_data_block_multi(inout GprsMS ms, integer num_blocks := 1, boolean with_tlli := false) +function f_ms_tx_ul_data_block_multi(inout GprsMS ms, integer num_blocks := 1, boolean with_tlli := false, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return octetstring { var octetstring total_payload := ''O; @@ -395,7 +429,7 @@ if (cv > g_bs_cv_max) { cv := 15; } - padding_len := f_ms_tx_ul_data_block(ms, payload, cv := cv, with_tlli := with_tlli) + padding_len := f_ms_tx_ul_data_block(ms, payload, cv := cv, with_tlli := with_tlli, nr := nr); total_payload := total_payload & payload & f_pad_oct(''O, padding_len, '00'O); } return total_payload; @@ -494,11 +528,12 @@ } //////////////////////// -// OLD APIs +// Low level APIs //////////////////////// function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, - template GsmRrMessage t_imm_ass := ?) + template GsmRrMessage t_imm_ass := ?, + template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var GsmRrMessage rr_imm_ass; var PCUIF_Message pcu_msg; @@ -507,7 +542,7 @@ T.start(2.0); alt { - [] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, + [] BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, ts_nr := 0, sapi := sapi, data := ?)) -> value pcu_msg { /* On PCH the payload is prefixed with paging group (3 octets): skip it. * TODO: add an additional template parameter, so we can match it. */ @@ -549,7 +584,8 @@ function f_pcuif_tx_rach_rx_imm_ass(uint16_t ra := bit2int(chan_req_def), uint8_t is_11bit := 0, PCUIF_BurstType burst_type := BURST_TYPE_0, - TimingAdvance ta := 0) + TimingAdvance ta := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var uint32_t fn; @@ -558,7 +594,7 @@ /* Send RACH.ind */ log("Sending RACH.ind on fn=", fn, " with RA=", ra, ", TA=", ta); - BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0, + BTS.send(ts_PCUIF_RACH_IND(nr.bts_nr, nr.trx_nr, ts_nr := 0, ra := ra, is_11bit := is_11bit, burst_type := burst_type, fn := fn, arfcn := 871, @@ -569,15 +605,16 @@ * we assume that 11 bit RA always contains EGPRS Packet Channel Request. */ if (is_11bit != 0) { ra := 127; } - /* Expect Immediate (TBF) Assignment on TS0/AGCH */ - return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH, tr_IMM_TBF_ASS(false, ra, fn)); + /* Expect Immediate (TBF) Assignment on the same TS/TRX/BTS */ + return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH, tr_IMM_TBF_ASS(false, ra, fn), nr); } /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ -function f_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0, uint32_t fn := 0) +function f_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var template RAW_PCU_EventParam ev_param := {tdma_fn := ? }; - BTS.send(ts_PCUIF_DATA_IND(bts_nr := 0, trx_nr := 0, ts_nr := 7, block_nr := 0, + BTS.send(ts_PCUIF_DATA_IND(nr.bts_nr, nr.trx_nr, nr.ts_nr, nr.blk_nr, sapi := PCU_IF_SAPI_PDTCH, data := data, fn := fn, arfcn := 871, lqual_cb := lqual_cb)); if (fn != 0) { @@ -587,18 +624,20 @@ } /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ -function f_pcuif_rx_data_req(out PCUIF_Message pcu_msg) +function f_pcuif_rx_data_req(out PCUIF_Message pcu_msg, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { - BTS.send(ts_PCUIF_RTS_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 7, + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, - arfcn := 871, block_nr := 0)); - BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 7, + arfcn := 871, block_nr := nr.blk_nr)); + BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg; } /* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ function f_pcuif_rx_pch_pag_req1(template MobileIdentityV mi1 := ?, - template integer pag_group := ?) + template integer pag_group := ?, + template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var GsmRrMessage rr_pag_req1; var PCUIF_Message pcu_msg; @@ -606,7 +645,7 @@ var integer pag_group_rx; var octetstring macblock; - BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, + BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PCH)) -> value pcu_msg; /* First 3 bytes contain IMSI suffix to calculate paging group: */ @@ -633,10 +672,12 @@ return rr_pag_req1; } -function f_rx_rlcmac_dl_block(out RlcmacDlBlock dl_block, out uint32_t dl_fn, template (present) CodingScheme exp_cs_mcs := ?) +function f_rx_rlcmac_dl_block(out RlcmacDlBlock dl_block, out uint32_t dl_fn, + template (present) CodingScheme exp_cs_mcs := ?, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var PCUIF_Message pcu_msg; - f_pcuif_rx_data_req(pcu_msg); + f_pcuif_rx_data_req(pcu_msg, nr := nr); dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data); dl_fn := pcu_msg.u.data_req.fn; @@ -650,11 +691,12 @@ function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block, out uint32_t poll_fn, template RlcmacDlBlock acknack_tmpl := (tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?), - tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?))) + tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?)), + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (match(dl_block, acknack_tmpl)) { poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp); return; @@ -663,22 +705,24 @@ f_shutdown(__BFILE__, __LINE__); } -function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block) +function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { setverdict(fail, "Failed to match Packet DUMMY DL"); f_shutdown(__BFILE__, __LINE__); } } -function f_rx_rlcmac_dl_block_exp_pkt_pag_req(out RlcmacDlBlock dl_block) +function f_rx_rlcmac_dl_block_exp_pkt_pag_req(out RlcmacDlBlock dl_block, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { var uint32_t dl_fn; - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); if (not match(dl_block, tr_RLCMAC_PACKET_PAG_REQ())) { setverdict(fail, "Failed to match Packet Paging Request: ", dl_block, " vs ", tr_RLCMAC_PACKET_PAG_REQ()); f_shutdown(__BFILE__, __LINE__); @@ -754,13 +798,14 @@ function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t dl_fn, template (present) octetstring data := ?, template (present) uint7_t exp_bsn := ?, - template (present) CodingScheme exp_cs := ?) + template (present) CodingScheme exp_cs := ?, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { /* FIXME: ideally we should use an alt statement with timeout here, rather than * having +100500 layers of abstraction. This would facilitate developing the * multi-TBF/-TRX/-BTS tests, where you cannot expect that the first received * block is exactly what you need. */ - f_rx_rlcmac_dl_block(dl_block, dl_fn); + f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); /* Make sure it's either GPRS or EGPRS data block */ if (not match(dl_block, tr_RLCMAC_DATA)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9bff9e912bf73ad6259946a6ea5b08f3e2f728c8 Gerrit-Change-Number: 20223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:02:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 21 Sep 2020 12:02:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmo_ign In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 ) Change subject: mgw: Introduce test TC_crcx_osmo_ign ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79415c385e89fe859854430bb20940f078fccea0 Gerrit-Change-Number: 20219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 21 Sep 2020 12:02:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:04:41 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 12:04:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Check attempted/successful channel requests References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 ) Change subject: Check attempted/successful channel requests ...................................................................... Check attempted/successful channel requests Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Related: SYS#4877 --- M bsc/BSC_Tests.cfg M bsc/BSC_Tests.ttcn 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/20225/1 diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 610e0f7..49f61a2 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -76,3 +76,21 @@ #BSC_Tests.TC_err_84_unknown_msg #BSC_Tests.TC_ho_int #BSC_Tests.TC_chopped_ipa_ping +#BSC_Tests.TC_ho_out_of_this_bsc +#BSC_Tests.TC_ho_out_fail_no_msc_response +#BSC_Tests.TC_ho_out_fail_rr_ho_failure +#BSC_Tests.TC_ho_out_fail_no_result_after_ho_cmd + +#BSC_Tests.TC_ho_into_this_bsc +#BSC_Tests.TC_ho_in_fail_msc_clears +#BSC_Tests.TC_ho_in_fail_msc_clears_after_ho_detect +#BSC_Tests.TC_ho_in_fail_no_detect +#BSC_Tests.TC_ho_in_fail_no_detect2 + +#BSC_Tests.TC_ho_neighbor_config_1 +#BSC_Tests.TC_ho_neighbor_config_2 +#BSC_Tests.TC_ho_neighbor_config_3 +#BSC_Tests.TC_ho_neighbor_config_4 +#BSC_Tests.TC_ho_neighbor_config_5 +#BSC_Tests.TC_ho_neighbor_config_6 +#BSC_Tests.TC_ho_neighbor_config_7 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8934f42..0fd0a17 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3222,6 +3222,8 @@ f_establish_fully(ass_cmd, exp_compl); var StatsDExpects expect := { + { name := "TTCN3.bts.0.chreq.total", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.chreq.successful", mtype := "c", min := 1, max := 1}, { name := "TTCN3.bsc.0.assignment.attempted", mtype := "c", min := 1, max := 1}, { name := "TTCN3.bsc.0.assignment.completed", mtype := "c", min := 1, max := 1} }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Gerrit-Change-Number: 20225 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:04:41 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 12:04:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... pcu: Check stats for pcu channel allocation, bytes transferred Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Related: SYS#4877 --- M pcu/PCU_Tests.default M pcu/PCU_Tests.ttcn M pcu/gen_links.sh M pcu/osmo-pcu.cfg M pcu/regen_makefile.sh 5 files changed, 64 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/20226/1 diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index 205327d..1dbced3 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -22,6 +22,7 @@ sgsn_role := true } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +StatsD_Checker.mp_enable_stats := true; [TESTPORT_PARAMETERS] *.PCU.socket_type := "SEQPACKET" @@ -34,6 +35,15 @@ *.PCUVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.PCUVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.PCUVTY.PROMPT1 := "OsmoPCU> " +*.STATSVTY.CTRL_MODE := "client" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.1" +*.STATSVTY.CTRL_PORTNUM := "4240" +*.STATSVTY.CTRL_LOGIN_SKIPPED := "yes" +*.STATSVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.STATSVTY.CTRL_READMODE := "buffered" +*.STATSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.STATSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.STATSVTY.PROMPT1 := "OsmoPCU> " [MAIN_CONTROLLER] diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 142cdcd..0bd7093 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -51,10 +51,18 @@ import from SGSN_Components all; import from GPRS_Components all; +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + modulepar { charstring mp_pcu_sock_path := PCU_SOCK_DEFAULT; float X2002 := 0.2; /* Timer -2002, IMM ASSIGN confirm delay */ + + charstring mp_pcu_statsd_ip := "127.0.0.1"; + integer mp_pcu_statsd_port := 8125; } @@ -102,10 +110,13 @@ uint8_t high } -type component RAW_PCU_Test_CT extends bssgp_CT, MS_BTS_IFACE_CT { +type component RAW_PCU_Test_CT extends bssgp_CT, MS_BTS_IFACE_CT, StatsD_ConnHdlr { /* PCU interface abstraction component */ var RAW_PCUIF_CT vc_PCUIF; + /* StatsD */ + var StatsD_Checker_CT vc_STATSD; + /* Connection to the PCUIF component */ port RAW_PCU_MSG_PT PCUIF; /* VTY connection to the PCU */ @@ -215,6 +226,11 @@ f_init_vty(id); + f_init_statsd(id, vc_STATSD, mp_pcu_statsd_ip, mp_pcu_statsd_port); + /* This is normally done in the ConnHdlr component, but here + * the Test_CT doubles as ConnHdlr */ + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + vc_PCUIF.start(f_PCUIF_CT_handler(mp_pcu_sock_path)); vc_BTS.start(f_BTS_CT_handler(0, valueof(info_ind))); @@ -1437,6 +1453,8 @@ /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); + f_statsd_reset(); + /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); @@ -1486,6 +1504,17 @@ /* Make sure that the next block (after the Ack) is dummy */ f_rx_rlcmac_dl_block_exp_dummy(dl_block); + var StatsDExpects expect := { + { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 0, max := 0}, + { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0}, + { name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 0, max := 0}, + { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min := 112, max := 112}, + { name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 0, max := 0} + }; + f_statsd_expect(expect); + f_shutdown(__BFILE__, __LINE__, final := true); } @@ -1849,6 +1878,8 @@ /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); + f_statsd_reset(); + /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); @@ -1878,6 +1909,16 @@ f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc), f_dl_block_ack_fn(dl_block, dl_fn)); + var StatsDExpects expect := { + { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min := 28, max := 28}, + { name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 16, max := 16} + }; + f_statsd_expect(expect); + f_shutdown(__BFILE__, __LINE__, final := true); } diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index a1e2e44..4c7e5c3 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -50,6 +50,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " FILES+="NS_Provider_IPL4.ttcn NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " diff --git a/pcu/osmo-pcu.cfg b/pcu/osmo-pcu.cfg index d6213b5..12dc577 100644 --- a/pcu/osmo-pcu.cfg +++ b/pcu/osmo-pcu.cfg @@ -9,6 +9,16 @@ logging print file basename last logging print extended-timestamp 1 logging level set-all debug +! +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable line vty no login diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index b2063ac..dc9b672 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc" +FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc" export CPPFLAGS_TTCN3="-DBSSGP_EM_L3" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:08:26 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 12:08:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Check attempted/successful channel requests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 to look at the new patch set (#2). Change subject: bsc: Check attempted/successful channel requests ...................................................................... bsc: Check attempted/successful channel requests Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Related: SYS#4877 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/20225/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Gerrit-Change-Number: 20225 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:08:32 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 12:08:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... bsc: Add HO tests (as comment) to BSC_Tests.cfg Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff --- M bsc/BSC_Tests.cfg 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/20227/1 diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 610e0f7..49f61a2 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -76,3 +76,21 @@ #BSC_Tests.TC_err_84_unknown_msg #BSC_Tests.TC_ho_int #BSC_Tests.TC_chopped_ipa_ping +#BSC_Tests.TC_ho_out_of_this_bsc +#BSC_Tests.TC_ho_out_fail_no_msc_response +#BSC_Tests.TC_ho_out_fail_rr_ho_failure +#BSC_Tests.TC_ho_out_fail_no_result_after_ho_cmd + +#BSC_Tests.TC_ho_into_this_bsc +#BSC_Tests.TC_ho_in_fail_msc_clears +#BSC_Tests.TC_ho_in_fail_msc_clears_after_ho_detect +#BSC_Tests.TC_ho_in_fail_no_detect +#BSC_Tests.TC_ho_in_fail_no_detect2 + +#BSC_Tests.TC_ho_neighbor_config_1 +#BSC_Tests.TC_ho_neighbor_config_2 +#BSC_Tests.TC_ho_neighbor_config_3 +#BSC_Tests.TC_ho_neighbor_config_4 +#BSC_Tests.TC_ho_neighbor_config_5 +#BSC_Tests.TC_ho_neighbor_config_6 +#BSC_Tests.TC_ho_neighbor_config_7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:10:43 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 12:10:43 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... ttcn3-pcu-test: Change config to support statsd Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Depends: osmo-ttcn3-hacks.git Change-Id I90964b32fa11ed2582afc5fb56bd302b06606f86 Related: SYS#4877 --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/osmo-pcu.cfg 3 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/28/20228/1 diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 17ab6c6..300937b 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -7,9 +7,13 @@ [TESTPORT_PARAMETERS] *.PCUVTY.CTRL_HOSTNAME := "172.18.13.101" *.PCUVTY.PROMPT1 := "OsmoPCU> " +*.STATSVTY.CTRL_HOSTNAME := "172.18.13.101" +*.STATSVTY.PROMPT1 := "OsmoPCU> " + [MODULE_PARAMETERS] PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts" +PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10" SGSN_Components.mp_nsconfig := { local_ip := "172.18.13.10", local_udp_port := 23000, @@ -19,6 +23,7 @@ nsei := 1234 } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 5dedec7..5191bf5 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -19,6 +19,13 @@ mkdir $VOL_BASE_DIR/unix +# Disable stats testing until libosmocore release > 1.4.0 +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg + sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg + sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg +fi + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pcu-test/osmo-pcu.cfg b/ttcn3-pcu-test/osmo-pcu.cfg index 326ad59..733cebe 100644 --- a/ttcn3-pcu-test/osmo-pcu.cfg +++ b/ttcn3-pcu-test/osmo-pcu.cfg @@ -11,7 +11,17 @@ logging print file basename last logging print extended-timestamp 1 logging level set-all debug - +! +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 172.18.13.10 + remote-port 8125 + flush-period 1 + mtu 1024 + enable +! line vty no login bind 172.18.13.101 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:15:20 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 12:15:20 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... Patch Set 1: Verified+1 Both jenkins incantations run through: IMAGE_SUFFIX="latest" OSMO_TTCN3_BRANCH=daniel/stats ./jenkins.sh OSMO_TTCN3_BRANCH=daniel/stats ./jenkins.sh -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 21 Sep 2020 12:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:21:43 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 21 Sep 2020 12:21:43 +0000 Subject: Change in osmo-msc[master]: mncc_call: fix memory overrun In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20201 ) Change subject: mncc_call: fix memory overrun ...................................................................... mncc_call: fix memory overrun The struct gsm_mncc which is created and populated in mncc_call_tx_setup_ind casted to a union mncc_msg* pointer. This leads to a memory overrun in mncc_call_tx because the union mncc_msg is larger then the gsm_mncc struct. To fix this, lets just declare a union mncc_msg and populate the signal member inside it. This can be handed over to mncc_call_tx. The data in it will look the same, except that the memory will have the proper lenght (longer). Change-Id: Ifff28b3375d6bd5e4f837f25c46736952f7bfa9b Fixes: CID 214330 --- M src/libmsc/mncc_call.c 1 file changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c index 9d52952..131620d 100644 --- a/src/libmsc/mncc_call.c +++ b/src/libmsc/mncc_call.c @@ -208,24 +208,25 @@ static void mncc_call_tx_setup_ind(struct mncc_call *mncc_call) { - struct gsm_mncc mncc_msg = mncc_call->outgoing_req; - mncc_msg.msg_type = MNCC_SETUP_IND; - mncc_msg.callref = mncc_call->callref; + union mncc_msg mncc_msg; + mncc_msg.signal = mncc_call->outgoing_req; + mncc_msg.signal.msg_type = MNCC_SETUP_IND; + mncc_msg.signal.callref = mncc_call->callref; - OSMO_STRLCPY_ARRAY(mncc_msg.imsi, mncc_call->vsub->imsi); + OSMO_STRLCPY_ARRAY(mncc_msg.signal.imsi, mncc_call->vsub->imsi); if (!(mncc_call->outgoing_req.fields & MNCC_F_CALLING)) { /* No explicit calling number set, use the local subscriber */ - mncc_msg.fields |= MNCC_F_CALLING; - OSMO_STRLCPY_ARRAY(mncc_msg.calling.number, mncc_call->vsub->msisdn); + mncc_msg.signal.fields |= MNCC_F_CALLING; + OSMO_STRLCPY_ARRAY(mncc_msg.signal.calling.number, mncc_call->vsub->msisdn); } mncc_call->local_msisdn_present = true; - mncc_call->local_msisdn = mncc_msg.calling; + mncc_call->local_msisdn = mncc_msg.signal.calling; rate_ctr_inc(&gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MO_SETUP]); - mncc_call_tx(mncc_call, (union mncc_msg*)&mncc_msg); + mncc_call_tx(mncc_call, &mncc_msg); } static void mncc_call_rx_setup_req(struct mncc_call *mncc_call, const struct gsm_mncc *incoming_req) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifff28b3375d6bd5e4f837f25c46736952f7bfa9b Gerrit-Change-Number: 20201 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:23:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 12:23:28 +0000 Subject: Change in osmo-mgw[master]: mgw: Avoid logging notice message each time we receive nt param in LCO In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20221 ) Change subject: mgw: Avoid logging notice message each time we receive nt param in LCO ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/20221/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/20221/1//COMMIT_MSG at 9 PS1, Line 9: server > server? you mean justify? deserve, nice momentary dyslexia I got here. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 12:23:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 12:45:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 21 Sep 2020 12:45:59 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19914 ) Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... Patch Set 1: keith, could you try whether this works? osmo-hlr branch neels/for_keith http://git.osmocom.org/osmo-hlr/commit/?h=neels/for_keith&id=472bb0733d6dcbf9d33fd0f56b030b9abd5c4566 i have no nitb db around at convenience to test; but that last patch on the branch should work to put the sql in hlr_db_tool.c. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: neels Gerrit-Comment-Date: Mon, 21 Sep 2020 12:45:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 13:45:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 13:45:45 +0000 Subject: Change in osmo-mgw[master]: mgw: Avoid logging notice message each time we receive nt param in LCO In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 to look at the new patch set (#2). Change subject: mgw: Avoid logging notice message each time we receive nt param in LCO ...................................................................... mgw: Avoid logging notice message each time we receive nt param in LCO We don't really use it so far and it doesn't deserve a NOTICE message. Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/20221/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 13:45:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 13:45:45 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix return value documentation for API mgcp_verify_call_id In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/20222 to look at the new patch set (#2). Change subject: mgw: Fix return value documentation for API mgcp_verify_call_id ...................................................................... mgw: Fix return value documentation for API mgcp_verify_call_id Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/22/20222/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 Gerrit-Change-Number: 20222 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 13:45:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 13:45:45 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 to look at the new patch set (#3). Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 --- M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_msg.c 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/24/20224/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 Gerrit-Change-Number: 20224 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 13:48:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 13:48:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 13:48:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 13:48:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 13:48:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Check attempted/successful channel requests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 ) Change subject: bsc: Check attempted/successful channel requests ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Gerrit-Change-Number: 20225 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 13:48:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 13:48:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 13:48:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... Patch Set 1: why are those set as comment? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 13:48:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 13:49:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 13:49:51 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 13:49:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:00:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 14:00:53 +0000 Subject: Change in osmo-mgw[master]: mgw: Avoid logging notice message each time we receive nt param in LCO In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20221 ) Change subject: mgw: Avoid logging notice message each time we receive nt param in LCO ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 14:00:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:03:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 14:03:30 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 14:03:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:07:02 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 14:07:02 +0000 Subject: Change in libosmocore[master]: gsm_08_16.h: Add missing header References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20229 ) Change subject: gsm_08_16.h: Add missing header ...................................................................... gsm_08_16.h: Add missing header utils.h is needed for struct value_string This probably never caused a problem because every file including gsm_08_16.h also included utils.h, but we should still include the file here. Change-Id: Iae09b4e8e42be6c371fb34279b7981db2af8cf4c --- M include/osmocom/gprs/protocol/gsm_08_16.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/20229/1 diff --git a/include/osmocom/gprs/protocol/gsm_08_16.h b/include/osmocom/gprs/protocol/gsm_08_16.h index e035ebf..f98f68d 100644 --- a/include/osmocom/gprs/protocol/gsm_08_16.h +++ b/include/osmocom/gprs/protocol/gsm_08_16.h @@ -7,6 +7,7 @@ #include #include +#include /*! \addtogroup libgb * @{ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iae09b4e8e42be6c371fb34279b7981db2af8cf4c Gerrit-Change-Number: 20229 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:12:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 14:12:28 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference.xsl: handle application specific attributes In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19676 ) Change subject: vty_reference.xsl: handle application specific attributes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I17794b2cb476bd54c7b35a1e23c0727352c3a2a9 Gerrit-Change-Number: 19676 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 14:12:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:12:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 14:12:38 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference.xsl: handle application specific attributes In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19676 ) Change subject: vty_reference.xsl: handle application specific attributes ...................................................................... vty_reference.xsl: handle application specific attributes Change-Id: I17794b2cb476bd54c7b35a1e23c0727352c3a2a9 Related: SYS#4937 --- M vty_reference.xsl 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/vty_reference.xsl b/vty_reference.xsl index e9d380c..414a1a8 100644 --- a/vty_reference.xsl +++ b/vty_reference.xsl @@ -40,6 +40,31 @@ + + + + + Attributes + + + + + + + + Flag: + + + Flag: (not assigned) + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I17794b2cb476bd54c7b35a1e23c0727352c3a2a9 Gerrit-Change-Number: 19676 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:40:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 14:40:50 +0000 Subject: Change in libosmocore[master]: gsm_08_16.h: Add missing header In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20229 ) Change subject: gsm_08_16.h: Add missing header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iae09b4e8e42be6c371fb34279b7981db2af8cf4c Gerrit-Change-Number: 20229 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 14:40:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:41:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 14:41:09 +0000 Subject: Change in osmo-mgw[master]: mgw: Avoid logging notice message each time we receive nt param in LCO In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20221 ) Change subject: mgw: Avoid logging notice message each time we receive nt param in LCO ...................................................................... mgw: Avoid logging notice message each time we receive nt param in LCO We don't really use it so far and it doesn't deserve a NOTICE message. Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: fixeria: 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 5523761..902c079 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -524,6 +524,7 @@ { char *lco_id; char codec[17]; + char nt[17]; int len; if (!options) @@ -562,6 +563,10 @@ osmo_str_toupper_buf(lco->codec, len + 1, codec); } break; + case 'n': + if (lco_id[1] == 't' && sscanf(lco_id + 2, ":%16[^,]", nt) == 1) + break; + /* else: fall throught to print notice log */ default: LOGP(DLMGCP, LOGL_NOTICE, "LCO: unhandled option: '%c'/%d in \"%s\"\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I058dc37fe6229e879284a8f5e7677d6016129c47 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:41:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 14:41:10 +0000 Subject: Change in osmo-mgw[master]: mgw: Fix return value documentation for API mgcp_verify_call_id In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20222 ) Change subject: mgw: Fix return value documentation for API mgcp_verify_call_id ...................................................................... mgw: Fix return value documentation for API mgcp_verify_call_id Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 2023a68..4242d3d 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -245,7 +245,7 @@ /*! Check if the specified callid seems plausible. * \param[in] endp pointer to endpoint * \param{in] callid to verify - * \returns 1 when callid seems plausible, 0 on error */ + * \returns 0 when callid seems plausible, -1 on error */ int mgcp_verify_call_id(struct mgcp_endpoint *endp, const char *callid) { /*! This function compares the supplied callid with the called that is -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5d32baf3a10dad73de29b4388eab14b93ab6f09 Gerrit-Change-Number: 20222 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:41:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 14:41:10 +0000 Subject: Change in osmo-mgw[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20224 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 --- M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_msg.c 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index ecb2845..9ebdd8e 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -641,8 +641,7 @@ OSMO_ASSERT(false); } - /* Make sure the endpoint is released when claiming the endpoint - * failes. */ + /* Make sure the endpoint is released when claiming the endpoint fails. */ if (rc < 0) mgcp_endp_release(endp); diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 4242d3d..8783e20 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -107,7 +107,7 @@ ret = -1; } - /* Special handling f?r RTP connections */ + /* Special handling for RTP connections */ if (conn->type == MGCP_CONN_TYPE_RTP) { conn->u.rtp.end.output_enabled = conn->mode & MGCP_CONN_SEND_ONLY ? 1 : 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie982e6721f9840ac9c0bca62646f5c97cc0b1139 Gerrit-Change-Number: 20224 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 14:54:20 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 21 Sep 2020 14:54:20 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: fix measurement handling for SUB frames In-Reply-To: References: Message-ID: Hello pespin, fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18035 to look at the new patch set (#9). Change subject: osmo-bts-trx/scheduler: fix measurement handling for SUB frames ...................................................................... osmo-bts-trx/scheduler: fix measurement handling for SUB frames Make sure that we pick the correct UL measurements from the history when we deal with AMR SID frames (SUB frames). Change-Id: I902bb47d68742d2589156f61099b67a0edbaf40b Related: OS#2978 --- M include/osmo-bts/scheduler.h M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/scheduler_trx.c 4 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/18035/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I902bb47d68742d2589156f61099b67a0edbaf40b Gerrit-Change-Number: 18035 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 15:04:34 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 15:04:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... Patch Set 1: > Patch Set 1: > > why are those set as comment? The .cfg file usually includes .control and had the individual TC included as comment - presumably as a template to comment out only the tests you are interested in. If you look at the file other tests are included, but not the newer HO ones. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 15:04:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 15:06:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 15:06:35 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: refactor UL burst measurement processing In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18973 ) Change subject: osmo-bts-trx/scheduler: refactor UL burst measurement processing ...................................................................... Patch Set 5: As it turned out, adding unit tests for low-level stuff like burst processing is not that easy as I thought initially. Unfortunately, I don't have enough time to work on that, so marking as 'Ready for review' again. I tried running ttcn3-bts-tests, and didn't notice any regressions. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b02b51fea5664f161382a4ddc63dbf14ffc9ac5 Gerrit-Change-Number: 18973 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 21 Sep 2020 15:06:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 15:13:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 15:13:55 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Avoid calling memcpy with size=0 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20230 ) Change subject: osmo_strlcpy: Avoid calling memcpy with size=0 ...................................................................... osmo_strlcpy: Avoid calling memcpy with size=0 Change-Id: Ic84af86d33c8a20f06036b13d0a10cf312582f0d --- M src/utils.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/20230/1 diff --git a/src/utils.c b/src/utils.c index 3c4a8c9..168f85f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -545,7 +545,7 @@ /*! Generic big-endian encoding of big endian number up to 64bit * \param[in] value unsigned integer value to be stored - * \param[in] data_len number of octets + * \param[in] data_len number of octets * \returns static buffer containing big-endian stored value * * This is like osmo_store64be_ext, except that this returns a static buffer of @@ -577,7 +577,7 @@ if (siz) { size_t len = (ret >= siz) ? siz - 1 : ret; - if (src) + if (len) memcpy(dst, src, len); dst[len] = '\0'; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic84af86d33c8a20f06036b13d0a10cf312582f0d Gerrit-Change-Number: 20230 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 15:13:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 15:13:55 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Clarify lenght calculation References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20231 ) Change subject: osmo_strlcpy: Clarify lenght calculation ...................................................................... osmo_strlcpy: Clarify lenght calculation Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 --- M src/utils.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/20231/1 diff --git a/src/utils.c b/src/utils.c index 168f85f..772b671 100644 --- a/src/utils.c +++ b/src/utils.c @@ -576,7 +576,7 @@ size_t ret = src ? strlen(src) : 0; if (siz) { - size_t len = (ret >= siz) ? siz - 1 : ret; + size_t len = OSMO_MIN(siz - 1, ret); if (len) memcpy(dst, src, len); dst[len] = '\0'; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 Gerrit-Change-Number: 20231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 15:14:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 15:14:13 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Clarify length calculation In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/20231 ) Change subject: osmo_strlcpy: Clarify length calculation ...................................................................... osmo_strlcpy: Clarify length calculation Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 --- M src/utils.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/20231/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 Gerrit-Change-Number: 20231 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:30:24 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 21 Sep 2020 16:30:24 +0000 Subject: Change in libosmocore[master]: gsm_08_16.h: Add missing header In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20229 ) Change subject: gsm_08_16.h: Add missing header ...................................................................... gsm_08_16.h: Add missing header utils.h is needed for struct value_string This probably never caused a problem because every file including gsm_08_16.h also included utils.h, but we should still include the file here. Change-Id: Iae09b4e8e42be6c371fb34279b7981db2af8cf4c --- M include/osmocom/gprs/protocol/gsm_08_16.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/protocol/gsm_08_16.h b/include/osmocom/gprs/protocol/gsm_08_16.h index e035ebf..f98f68d 100644 --- a/include/osmocom/gprs/protocol/gsm_08_16.h +++ b/include/osmocom/gprs/protocol/gsm_08_16.h @@ -7,6 +7,7 @@ #include #include +#include /*! \addtogroup libgb * @{ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iae09b4e8e42be6c371fb34279b7981db2af8cf4c Gerrit-Change-Number: 20229 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:34:22 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 21 Sep 2020 16:34:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: use IPV4 as default References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 ) Change subject: MSC_ConnectionHandler: use IPV4 as default ...................................................................... MSC_ConnectionHandler: use IPV4 as default When the BSC sends a CRCX without an IP address in it, the testcase will automatically assign an IPV6 address in the response. However, this breaks compatibility with older versions of osmo-bsc that do not have IPV6 support. Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/20232/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index c372709..3235ade 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -279,7 +279,7 @@ var MgcpOsmuxCID osmux_cid; var SDP_Message sdp; var integer cid := f_get_free_mgcp_conn(); - var charstring local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */ + var charstring local_rtp_addr := host_mgw_rtp_v4; /* Use IPv4 by default if no remote addr is provided by client */ if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) { if (cid != 0) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c Gerrit-Change-Number: 20232 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:41:41 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 21 Sep 2020 16:41:41 +0000 Subject: Change in osmo-bsc[master]: abis_nm: abis_nm_perform_test: fix a potential null deref References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20233 ) Change subject: abis_nm: abis_nm_perform_test: fix a potential null deref ...................................................................... abis_nm: abis_nm_perform_test: fix a potential null deref gcc 10.2.0 warns msgb can be a deref because nm_msgb_alloc() can fail with null. Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 --- M src/osmo-bsc/abis_nm.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/20233/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index ec52380..4691137 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2193,8 +2193,11 @@ DEBUGP(DNM, "PERFORM TEST %s\n", abis_nm_test_name(test_nr)); - if (!msg) + if (!msg) { msg = nm_msgb_alloc(); + if (!msg) + return -ENOMEM; + } msgb_tv_push(msg, NM_ATT_AUTON_REPORT, auton_report); msgb_tv_push(msg, NM_ATT_TEST_NO, test_nr); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 Gerrit-Change-Number: 20233 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:54:48 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 21 Sep 2020 16:54:48 +0000 Subject: Change in osmo-bsc[master]: abis_nm: abis_nm_perform_test: fix a potential null deref In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20233 to look at the new patch set (#2). Change subject: abis_nm: abis_nm_perform_test: fix a potential null deref ...................................................................... abis_nm: abis_nm_perform_test: fix a potential null deref gcc 10.2.0 warns msgb can be a deref because nm_msgb_alloc() can fail with null. Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 --- M src/osmo-bsc/abis_nm.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/20233/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 Gerrit-Change-Number: 20233 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:54:48 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 21 Sep 2020 16:54:48 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 7 files changed, 72 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 90ab8ea..ed1101a 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include #include #include @@ -745,9 +747,7 @@ int id; uint16_t nsvci; uint16_t local_port; /* on the BTS */ - uint16_t remote_port; /* on the SGSN */ - uint32_t remote_ip; /* on the SGSN */ - + struct osmo_sockaddr remote; struct gsm_abis_mo mo; }; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 003939b..bb72179 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -762,17 +763,17 @@ for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { struct gsm_bts_gprs_nsvc *nsvc = &bts->gprs.nsvc[i]; - struct in_addr ia; + struct osmo_sockaddr_str remote; + osmo_sockaddr_str_to_sockaddr(&remote, &nsvc->remote.u.sas); - ia.s_addr = htonl(nsvc->remote_ip); vty_out(vty, " gprs nsvc %u nsvci %u%s", i, nsvc->nsvci, VTY_NEWLINE); vty_out(vty, " gprs nsvc %u local udp port %u%s", i, nsvc->local_port, VTY_NEWLINE); vty_out(vty, " gprs nsvc %u remote udp port %u%s", i, - nsvc->remote_port, VTY_NEWLINE); + remote.port, VTY_NEWLINE); vty_out(vty, " gprs nsvc %u remote ip %s%s", i, - inet_ntoa(ia), VTY_NEWLINE); + remote.ip, VTY_NEWLINE); } /* EGPRS specific parameters */ @@ -3010,26 +3011,39 @@ GPRS_CHECK_ENABLED(bts); - bts->gprs.nsvc[idx].remote_port = atoi(argv[1]); + /* sockaddr_in and sockaddr_in6 have the port at the same position */ + bts->gprs.nsvc[idx].remote.u.sin.sin_port = htons(atoi(argv[1])); return CMD_SUCCESS; } DEFUN(cfg_bts_gprs_nsvc_rip, cfg_bts_gprs_nsvc_rip_cmd, - "gprs nsvc <0-1> remote ip A.B.C.D", + "gprs nsvc <0-1> remote ip " VTY_IPV46_CMD, GPRS_TEXT NSVC_TEXT "GPRS NS Remote IP Address\n" "GPRS NS Remote IP Address\n" "GPRS NS Remote IP Address\n") { struct gsm_bts *bts = vty->index; + struct osmo_sockaddr_str remote; int idx = atoi(argv[0]); - struct in_addr ia; + int ret; GPRS_CHECK_ENABLED(bts); - inet_aton(argv[1], &ia); - bts->gprs.nsvc[idx].remote_ip = ntohl(ia.s_addr); + ret = osmo_sockaddr_str_from_str2(&remote, argv[1]); + if (ret) { + vty_out(vty, "%% Invalid IP address %s%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + + bts->gprs.nsvc[idx].remote.u.sas.ss_family = remote.af; + switch (remote.af) { + case AF_INET: + osmo_sockaddr_str_to_in_addr(&remote, &bts->gprs.nsvc[idx].remote.u.sin.sin_addr); + case AF_INET6: + osmo_sockaddr_str_to_in6_addr(&remote, &bts->gprs.nsvc[idx].remote.u.sin6.sin6_addr); + } return CMD_SUCCESS; } diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 796d208..eb2d3c8 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -227,6 +227,12 @@ /* We skip NSVC1 since we only use NSVC0 */ if (nsvc->id == 1) break; + if (osmo_bts_has_feature(&bts->features, BTS_FEAT_IPV6_NSVC) && + nsvc->remote.u.sa.sa_family == AF_INET6) { + LOGP(DLINP, LOGL_ERROR, "BTS %d does not support IPv6 but require it!\n", bts->nr); + break; + } + if ((new_state->availability == NM_AVSTATE_OFF_LINE) || (new_state->availability == NM_AVSTATE_DEPENDENCY)) { msgb = nanobts_attr_nscv_get(bts); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index b979cc7..75d0306 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -24,6 +24,7 @@ #include #include #include +#include struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) { @@ -202,13 +203,25 @@ buf[1] = bts->gprs.nsvc[0].nsvci & 0xff; msgb_tl16v_put(msgb, NM_ATT_IPACC_NSVCI, 2, buf); - /* remote udp port */ - osmo_store16be(bts->gprs.nsvc[0].remote_port, &buf[0]); - /* remote ip address */ - osmo_store32be(bts->gprs.nsvc[0].remote_ip, &buf[2]); - /* local udp port */ - osmo_store16be(bts->gprs.nsvc[0].local_port, &buf[6]); - msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_LINK_CFG, 8, buf); + if (bts->gprs.nsvc->remote.u.sa.sa_family == AF_INET6) { + /* protocol family */ + osmo_store16be(IPPROTO_IPV6, &buf[0]); + /* local udp port */ + osmo_store16be(bts->gprs.nsvc[0].local_port, &buf[2]); + /* remote udp port */ + memcpy(&buf[4], &bts->gprs.nsvc[0].remote.u.sin6.sin6_port, sizeof(uint16_t)); + /* remote ip address */ + memcpy(&buf[6], &bts->gprs.nsvc[0].remote.u.sin6.sin6_addr, sizeof(struct in6_addr)); + msgb_tl16v_put(msgb, NM_ATT_OSMO_NS_LINK_CFG, 6 + sizeof(struct in6_addr), buf); + } else { + /* remote udp port */ + memcpy(&buf[0], &bts->gprs.nsvc[0].remote.u.sin.sin_port, sizeof(uint16_t)); + /* remote ip address */ + memcpy(&buf[2], &bts->gprs.nsvc[0].remote.u.sin.sin_addr, sizeof(struct in_addr)); + /* local udp port */ + osmo_store16be(bts->gprs.nsvc[0].local_port, &buf[6]); + msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_LINK_CFG, 8, buf); + } return msgb; } diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c index df43d76..d7d15eb 100644 --- a/src/osmo-bsc/bts_sysmobts.c +++ b/src/osmo-bsc/bts_sysmobts.c @@ -61,5 +61,7 @@ osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_EGPRS); osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_PAGING_COORDINATION); + model_sysmobts.nm_att_tlvdef.def[NM_ATT_OSMO_NS_LINK_CFG].type = TLV_TYPE_TL16V; + return gsm_bts_model_register(&model_sysmobts); } diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index ae4ac8a..30a73cc 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -190,10 +191,21 @@ /* NSVC */ for (i = 0; i < ARRAY_SIZE(info_ind->nsvci); i++) { nsvc = &bts->gprs.nsvc[i]; + + switch (nsvc->remote.u.sa.sa_family) { + case AF_UNSPEC: + continue; + case AF_INET6: + LOGP(DPCU, LOGL_ERROR, "Can not encode IPv6 NSVC!"); + continue; + case AF_INET: + break; + } + info_ind->nsvci[i] = nsvc->nsvci; info_ind->local_port[i] = nsvc->local_port; - info_ind->remote_port[i] = nsvc->remote_port; - info_ind->remote_ip[i] = nsvc->remote_ip; + info_ind->remote_port[i] = osmo_ntohs(nsvc->remote.u.sin.sin_port); + info_ind->remote_ip[i] = osmo_ntohl(nsvc->remote.u.sin.sin_addr.s_addr); } for (i = 0; i < ARRAY_SIZE(info_ind->trx); i++) { diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index ea98409..6c2d582 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -263,9 +263,11 @@ }; /* Parameters needed to test nanobts_attr_nscv_get() */ + /* FIXME: add ipv6 test */ + struct osmo_sockaddr_str addr; + osmo_sockaddr_str_from_str(&addr, "10.9.1.101", 23000); + osmo_sockaddr_str_to_sockaddr(&addr, &bts->gprs.nsvc[0].remote.u.sas); bts->gprs.nsvc[0].nsvci = 0x65; - bts->gprs.nsvc[0].remote_port = 0x59d8; - bts->gprs.nsvc[0].remote_ip = 0x0a090165; bts->gprs.nsvc[0].local_port = 0x5a3c; uint8_t attr_nscv_expected[] = { 0x9f, 0x00, 0x02, 0x00, 0x65, 0xa2, 0x00, 0x08, 0x59, 0xd8, 0x0a, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:55:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 16:55:17 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: drop redundant 'break' statements References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20235 ) Change subject: vty: cosmetic: drop redundant 'break' statements ...................................................................... vty: cosmetic: drop redundant 'break' statements Change-Id: I54ee7c3c6fe16a413d0e1128c7358ff6e4b76c6a --- M src/vty/vty.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/20235/1 diff --git a/src/vty/vty.c b/src/vty/vty.c index ebdf9fc..e335f3a 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1143,14 +1143,12 @@ vty_prompt(vty); vty_redraw_line(vty); return; - break; case CMD_ERR_NO_MATCH: cmd_free_strvec(vline); vty_out(vty, "%% There is no matched command.%s", VTY_NEWLINE); vty_prompt(vty); vty_redraw_line(vty); return; - break; } /* Get width of command string. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I54ee7c3c6fe16a413d0e1128c7358ff6e4b76c6a Gerrit-Change-Number: 20235 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:55:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 16:55:20 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20236 ) Change subject: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() ...................................................................... vty: cosmetic: s/width/cmd_width/g in vty_describe_command() Change-Id: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5 --- M src/vty/vty.c 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/20236/1 diff --git a/src/vty/vty.c b/src/vty/vty.c index e335f3a..2b131a4 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1119,7 +1119,7 @@ int ret; vector vline; vector describe; - unsigned int i, width, desc_width; + unsigned int i, cmd_width, desc_width; struct desc *desc, *desc_cr = NULL; vline = cmd_make_strvec(vty->buf); @@ -1152,7 +1152,7 @@ } /* Get width of command string. */ - width = 0; + cmd_width = 0; for (i = 0; i < vector_active(describe); i++) if ((desc = vector_slot(describe, i)) != NULL) { unsigned int len; @@ -1164,12 +1164,12 @@ if (desc->cmd[0] == '.') len--; - if (width < len) - width = len; + if (cmd_width < len) + cmd_width = len; } /* Get width of description string. */ - desc_width = vty->width - (width + 6); + desc_width = vty->width - (cmd_width + 6); /* Print out description. */ for (i = 0; i < vector_active(describe); i++) @@ -1188,15 +1188,15 @@ '.' ? desc->cmd + 1 : desc->cmd, VTY_NEWLINE); else if (desc_width >= strlen(desc->str)) - vty_out(vty, " %-*s %s%s", width, + vty_out(vty, " %-*s %s%s", cmd_width, desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, desc->str, VTY_NEWLINE); else - vty_describe_fold(vty, width, desc_width, desc); + vty_describe_fold(vty, cmd_width, desc_width, desc); #if 0 - vty_out(vty, " %-*s %s%s", width + vty_out(vty, " %-*s %s%s", cmd_width desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, desc->str ? desc->str : "", VTY_NEWLINE); #endif /* 0 */ @@ -1208,11 +1208,11 @@ desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, VTY_NEWLINE); else if (desc_width >= strlen(desc->str)) - vty_out(vty, " %-*s %s%s", width, + vty_out(vty, " %-*s %s%s", cmd_width, desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, desc->str, VTY_NEWLINE); else - vty_describe_fold(vty, width, desc_width, desc); + vty_describe_fold(vty, cmd_width, desc_width, desc); } cmd_free_strvec(vline); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5 Gerrit-Change-Number: 20236 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 16:55:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 16:55:21 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: fix missing curly braces in vty_describe_command() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20237 ) Change subject: vty: cosmetic: fix missing curly braces in vty_describe_command() ...................................................................... vty: cosmetic: fix missing curly braces in vty_describe_command() Change-Id: I1585ee70a3db77aa8737f9463c4d0665f4e90d90 --- M src/vty/vty.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/20237/1 diff --git a/src/vty/vty.c b/src/vty/vty.c index 2b131a4..6e7bdcb 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1153,7 +1153,7 @@ /* Get width of command string. */ cmd_width = 0; - for (i = 0; i < vector_active(describe); i++) + for (i = 0; i < vector_active(describe); i++) { if ((desc = vector_slot(describe, i)) != NULL) { unsigned int len; @@ -1167,12 +1167,13 @@ if (cmd_width < len) cmd_width = len; } + } /* Get width of description string. */ desc_width = vty->width - (cmd_width + 6); /* Print out description. */ - for (i = 0; i < vector_active(describe); i++) + for (i = 0; i < vector_active(describe); i++) { if ((desc = vector_slot(describe, i)) != NULL) { if (desc->cmd[0] == '\0') continue; @@ -1201,6 +1202,7 @@ desc->str ? desc->str : "", VTY_NEWLINE); #endif /* 0 */ } + } if ((desc = desc_cr)) { if (!desc->str) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1585ee70a3db77aa8737f9463c4d0665f4e90d90 Gerrit-Change-Number: 20237 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:01:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:01:35 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19513 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I04782222b499d0488269544910fbd4ed9929c05d Gerrit-Change-Number: 19513 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 17:01:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:06:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:06:26 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 10: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20177 ) Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6d60277eb5b8d938d9f38114c933d58ee1b884c9 Gerrit-Change-Number: 20177 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 17:06:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:06:57 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 21 Sep 2020 17:06:57 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19513 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I04782222b499d0488269544910fbd4ed9929c05d Gerrit-Change-Number: 19513 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 17:06:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:09:37 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 21 Sep 2020 17:09:37 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 1: Code-Review-1 Also need ttcn3 validation -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 17:09:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:17:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:17:50 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add support for IPv6 NSVCs References: Message-ID: Hello lynxis lazus, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20238 to review the following change. Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... pcuif_proto: version 10: add support for IPv6 NSVCs Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f Related: SYS#4915 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/38/20238/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 30ca268..39e1462 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -2,10 +2,11 @@ #define _PCUIF_PROTO_H #include +#include #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x09 +#define PCU_IF_VERSION 0x0a #define TXT_MAX_LEN 128 /* msg_type */ @@ -50,6 +51,11 @@ #define PCU_IF_FLAG_MCS8 (1 << 27) #define PCU_IF_FLAG_MCS9 (1 << 28) +/* NSVC address type */ +#define PCU_IF_ADDR_TYPE_UNSPEC 0x00 /* No address - empty entry */ +#define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ +#define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -164,7 +170,11 @@ uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + uint8_t address_type[2]; + union { + struct in_addr v4; + struct in6_addr v6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index c2cc2c1..1bc0b12 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -567,11 +567,15 @@ LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]); LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]); LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]); - ia.s_addr = htonl(info_ind->remote_ip[0]); + ia.s_addr = info_ind->remote_ip[0].v4.s_addr; LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia)); + if (info_ind->address_type[0] != PCU_IF_ADDR_TYPE_IPV4) { + goto bssgp_failed; + } + pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0], - info_ind->remote_ip[0], info_ind->remote_port[0], + ntohl(info_ind->remote_ip[0].v4.s_addr), info_ind->remote_port[0], info_ind->nsei, info_ind->nsvci[0], info_ind->bvci, info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac, info_ind->cell_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f Gerrit-Change-Number: 20238 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:42:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:42:09 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19513 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... pcuif_proto: version 10: add frequency hopping parameters Change-Id: I04782222b499d0488269544910fbd4ed9929c05d Related: Idf11bc4ba3ff0b00b32f2beab8fd020c67119d05 Related: SYS#4868, OS#4546, OS#4547 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 99 insertions(+), 5 deletions(-) Approvals: lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index e88607e..80d4f90 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -5,7 +5,7 @@ #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x09 +#define PCU_IF_VERSION 0x0a #define TXT_MAX_LEN 128 /* msg_type */ @@ -112,12 +112,21 @@ uint8_t ts_nr; } __attribute__ ((packed)); +struct gsm_pcu_if_info_trx_ts { + uint8_t tsc; + uint8_t hopping; + uint8_t hsn; + uint8_t maio; + uint8_t ma_bit_len; + uint8_t ma[8]; +} __attribute__ ((packed)); + struct gsm_pcu_if_info_trx { uint16_t arfcn; - uint8_t pdch_mask; /* PDCH channels per TS */ + uint8_t pdch_mask; /* PDCH timeslot mask */ uint8_t spare; - uint8_t tsc[8]; /* TSC per channel */ uint32_t hlayer1; + struct gsm_pcu_if_info_trx_ts ts[8]; } __attribute__ ((packed)); struct gsm_pcu_if_info_ind { diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 9464311..f5ead3b 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -115,6 +115,82 @@ } } +/* As a BTS, we do not (and neither need to) know the Mobile Allocation, because + * in CS domain it's responsibility of the BSC to encode RR messages containing + * this IE. However, a BTS co-located PCU needs to know all hopping parameters, + * including the Mobile Allocation, because it's responsible for encoding of the + * packet resource assignment messages. + * + * This function, similar to generate_ma_for_ts() in osmo-bsc, computes the + * Mobile Allocation bit-mask and populates the given part of INFO.ind with + * the hopping parameters for the given timeslot. */ +static void info_ind_fill_fhp(struct gsm_pcu_if_info_trx_ts *ts_info, + const struct gsm_bts_trx_ts *ts) +{ + const struct gsm_bts *bts = ts->trx->bts; + const struct gsm_bts_trx *trx; + uint8_t ca_buf[1024 / 8] = { 0 }; + uint8_t sa_buf[1024 / 8] = { 0 }; + struct bitvec ca, sa, ma; + unsigned int i; + + ts_info->maio = ts->hopping.maio; + ts_info->hsn = ts->hopping.hsn; + ts_info->hopping = 0x01; + + /* Cell Allocation bit-mask */ + ca = (struct bitvec) { + .data_len = sizeof(ca_buf), + .data = &ca_buf[0], + }; + + llist_for_each_entry(trx, &bts->trx_list, list) { + /* Skip non-provisioned transceivers */ + if (trx->mo.nm_attr == NULL) { + LOGPTRX(trx, DPCU, LOGL_NOTICE, "not (yet) provisioned\n"); + continue; + } + + bitvec_set_bit_pos(&ca, trx->arfcn, ONE); + ts_info->ma_bit_len++; + } + + /* Slot Allocation bit-mask */ + sa = (struct bitvec) { + .data_len = sizeof(sa_buf), + .data = &sa_buf[0], + }; + + for (i = 0; i < ts->hopping.arfcn_num; i++) { + bitvec_set_bit_pos(&sa, ts->hopping.arfcn_list[i], ONE); + if (bitvec_get_bit_pos(&ca, ts->hopping.arfcn_list[i]) != ONE) { + LOGP(DPCU, LOGL_NOTICE, "A transceiver with ARFCN %u " + "is not (yet) provisioned\n", ts->hopping.arfcn_list[i]); + bitvec_set_bit_pos(&ca, ts->hopping.arfcn_list[i], ONE); + ts_info->ma_bit_len++; + } + } + + /* Mobile Allocation bit-mask */ + ma = (struct bitvec) { + .cur_bit = sizeof(ts_info->ma) * 8 - 1, + .data_len = sizeof(ts_info->ma), + .data = &ts_info->ma[0], + }; + + /* Skip ARFCN 0, it goes to the end of MA bit-mask */ + for (i = 1; i < sizeof(ca_buf) * 8; i++) { + if (bitvec_get_bit_pos(&ca, i) != ONE) + continue; + if (bitvec_get_bit_pos(&sa, i) == ONE) + bitvec_set_bit_pos(&ma, ma.cur_bit, ONE); + ma.cur_bit--; + } + + if (bitvec_get_bit_pos(&sa, 0) == ONE) + bitvec_set_bit_pos(&ma, ma.cur_bit, ONE); +} + static void info_ind_fill_trx(struct gsm_pcu_if_info_trx *trx_info, const struct gsm_bts_trx *trx) { @@ -141,10 +217,19 @@ continue; trx_info->pdch_mask |= (1 << tn); - trx_info->tsc[tn] = gsm_ts_tsc(ts); + trx_info->ts[tn].tsc = gsm_ts_tsc(ts); + + if (ts->hopping.enabled) + info_ind_fill_fhp(&trx_info->ts[tn], ts); LOGPTRX(trx, DPCU, LOGL_INFO, "PDCH on ts=%u is available " - "(tsc=%u arfcn=%u)\n", ts->nr, trx_info->tsc[tn], trx->arfcn); + "(tsc=%u ", ts->nr, trx_info->ts[tn].tsc); + if (ts->hopping.enabled) { + LOGPC(DPCU, LOGL_INFO, "hopping=yes hsn=%u maio=%u ma_bit_len=%u)\n", + ts->hopping.hsn, ts->hopping.maio, trx_info->ts[tn].ma_bit_len); + } else { + LOGPC(DPCU, LOGL_INFO, "hopping=no arfcn=%u)\n", trx->arfcn); + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I04782222b499d0488269544910fbd4ed9929c05d Gerrit-Change-Number: 19513 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:42:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:42:10 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 10: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20177 ) Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... pcuif_proto: version 10: add support for IPv6 NSVCs Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I6d60277eb5b8d938d9f38114c933d58ee1b884c9 Related: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 Related: SYS#4915 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 13 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 80d4f90..8f72602 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -2,6 +2,7 @@ #define _PCUIF_PROTO_H #include +#include #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" @@ -50,6 +51,11 @@ #define PCU_IF_FLAG_MCS8 (1 << 27) #define PCU_IF_FLAG_MCS9 (1 << 28) +/* NSVC address type */ +#define PCU_IF_ADDR_TYPE_UNSPEC 0x00 /* No address - empty entry */ +#define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ +#define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -164,7 +170,11 @@ uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + uint8_t address_type[2]; + union { + struct in_addr v4; + struct in6_addr v6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index f5ead3b..c922584 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -332,7 +332,8 @@ info_ind->nsvci[i] = nsvc->nsvci; info_ind->local_port[i] = nsvc->local_port; info_ind->remote_port[i] = nsvc->remote_port; - info_ind->remote_ip[i] = nsvc->remote_ip; + info_ind->remote_ip[i].v4.s_addr = htonl(nsvc->remote_ip); + info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV4; } llist_for_each_entry(trx, &bts->trx_list, list) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6d60277eb5b8d938d9f38114c933d58ee1b884c9 Gerrit-Change-Number: 20177 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:42:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:42:32 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19789 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6863830883d90954006a7126c22d348aa2a83271 Gerrit-Change-Number: 19789 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 17:42:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:49:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:49:39 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: Hello lynxis lazus, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19789 to look at the new patch set (#8). Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... pcuif_proto: version 10: add frequency hopping parameters Change-Id: I6863830883d90954006a7126c22d348aa2a83271 Related: SYS#4868, OS#4547 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 34 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/89/19789/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6863830883d90954006a7126c22d348aa2a83271 Gerrit-Change-Number: 19789 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:49:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 17:49:59 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20238 ) Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f Gerrit-Change-Number: 20238 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 17:49:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:58:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 17:58:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... Patch Set 1: I'm just wondering whether it really makes sense to have all those tests tere commented... I mean, if you want to run one test, simply add the line, that's what I do when I run stuff in the docker setup. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 17:58:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 17:58:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 17:58:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... Patch Set 1: So, what I mean: Let's drop all those commented lines instead of adding new ones. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 17:58:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:02:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 18:02:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: use IPV4 as default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 ) Change subject: MSC_ConnectionHandler: use IPV4 as default ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232/1/bsc/MSC_ConnectionHandler.ttcn File bsc/MSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232/1/bsc/MSC_ConnectionHandler.ttcn at 282 PS1, Line 282: var charstring local_rtp_addr := host_mgw_rtp_v4; /* Use IPv4 by default if no remote addr is provided by client */ That's going to break in ttcn3-bsc-master. You need to add a mp parameter to assing one or another based on latest or master, since mgw now serves IPv6 by default first if client doesn't request a specific IP version (IP version can be changed later when setting remote address through MDCX). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c Gerrit-Change-Number: 20232 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 18:02:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:03:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 18:03:01 +0000 Subject: Change in osmo-bsc[master]: abis_nm: abis_nm_perform_test: fix a potential null deref In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20233 ) Change subject: abis_nm: abis_nm_perform_test: fix a potential null deref ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 Gerrit-Change-Number: 20233 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 18:03:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:03:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 18:03:17 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19789 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6863830883d90954006a7126c22d348aa2a83271 Gerrit-Change-Number: 19789 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 18:03:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:03:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 18:03:21 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: drop redundant 'break' statements In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20235 ) Change subject: vty: cosmetic: drop redundant 'break' statements ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I54ee7c3c6fe16a413d0e1128c7358ff6e4b76c6a Gerrit-Change-Number: 20235 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 18:03:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:04:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 18:04:00 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20238 ) Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f Gerrit-Change-Number: 20238 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 21 Sep 2020 18:04:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:04:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 18:04:02 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20236 ) Change subject: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5 Gerrit-Change-Number: 20236 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 18:04:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:04:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 18:04:26 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: fix missing curly braces in vty_describe_command() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20237 ) Change subject: vty: cosmetic: fix missing curly braces in vty_describe_command() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1585ee70a3db77aa8737f9463c4d0665f4e90d90 Gerrit-Change-Number: 20237 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 18:04:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:04:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 18:04:43 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19789 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... pcuif_proto: version 10: add frequency hopping parameters Change-Id: I6863830883d90954006a7126c22d348aa2a83271 Related: SYS#4868, OS#4547 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 34 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index e88607e..61c63af 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -5,7 +5,7 @@ #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x09 +#define PCU_IF_VERSION 0x0a #define TXT_MAX_LEN 128 /* msg_type */ @@ -112,12 +112,21 @@ uint8_t ts_nr; } __attribute__ ((packed)); +struct gsm_pcu_if_info_ts { + uint8_t tsc; + uint8_t h; + uint8_t hsn; + uint8_t maio; + uint8_t ma_bit_len; + uint8_t ma[8]; +} __attribute__ ((packed)); + struct gsm_pcu_if_info_trx { uint16_t arfcn; - uint8_t pdch_mask; /* PDCH channels per TS */ + uint8_t pdch_mask; /* PDCH timeslot mask */ uint8_t spare; - uint8_t tsc[8]; /* TSC per channel */ uint32_t hlayer1; + struct gsm_pcu_if_info_ts ts[8]; /* timeslots per TRX */ } __attribute__ ((packed)); struct gsm_pcu_if_info_ind { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 2374606..c2cc2c1 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -630,6 +630,7 @@ } for (ts_nr = 0; ts_nr < ARRAY_SIZE(bts->trx[0].pdch); ts_nr++) { + const struct gsm_pcu_if_info_ts *its = &info_ind->trx[trx_nr].ts[ts_nr]; struct gprs_rlcmac_pdch *pdch = &bts->trx[trx_nr].pdch[ts_nr]; if ((info_ind->trx[trx_nr].pdch_mask & (1 << ts_nr))) { /* FIXME: activate dynamically at RLCMAC */ @@ -643,9 +644,27 @@ pcu_tx_act_req(trx_nr, ts_nr, 1); pdch->enable(); } - pdch->tsc = info_ind->trx[trx_nr].tsc[ts_nr]; - LOGP(DL1IF, LOGL_INFO, "PDCH: trx=%d ts=%d\n", - trx_nr, ts_nr); + + pdch->tsc = its->tsc; + + /* (Optional) frequency hopping parameters */ + if (its->h) { + pdch->fh.enabled = true; + pdch->fh.maio = its->maio; + pdch->fh.hsn = its->hsn; + + OSMO_ASSERT(its->ma_bit_len <= sizeof(pdch->fh.ma) * 8); + pdch->fh.ma_oct_len = OSMO_BYTES_FOR_BITS(its->ma_bit_len); + pdch->fh.ma_bit_len = its->ma_bit_len; + + /* Mobile Allocation + padding (byte/bit order as on the wire): + * | 00 00 00 00 00 cc bb aa | -> | cc bb aa 00 00 00 00 00 | */ + unsigned int offset = sizeof(pdch->fh.ma) - pdch->fh.ma_oct_len; + memcpy(pdch->fh.ma, its->ma + offset, pdch->fh.ma_oct_len); + } + + LOGP(DL1IF, LOGL_INFO, "PDCH (trx=%u, ts=%u): tsc=%u, hopping=%s\n", + trx_nr, ts_nr, pdch->tsc, pdch->fh.enabled ? "yes" : "no"); } else { if (pdch->is_enabled()) { pcu_tx_act_req(trx_nr, ts_nr, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6863830883d90954006a7126c22d348aa2a83271 Gerrit-Change-Number: 19789 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:04:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 18:04:44 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 10: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20238 ) Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... pcuif_proto: version 10: add support for IPv6 NSVCs Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f Related: SYS#4915 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 24 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 61c63af..82d761d 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -2,6 +2,7 @@ #define _PCUIF_PROTO_H #include +#include #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" @@ -50,6 +51,11 @@ #define PCU_IF_FLAG_MCS8 (1 << 27) #define PCU_IF_FLAG_MCS9 (1 << 28) +/* NSVC address type */ +#define PCU_IF_ADDR_TYPE_UNSPEC 0x00 /* No address - empty entry */ +#define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ +#define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -164,7 +170,11 @@ uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + uint8_t address_type[2]; + union { + struct in_addr v4; + struct in6_addr v6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index c2cc2c1..21eacfd 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -567,11 +567,22 @@ LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]); LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]); LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]); - ia.s_addr = htonl(info_ind->remote_ip[0]); + ia.s_addr = info_ind->remote_ip[0].v4.s_addr; LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia)); + switch (info_ind->address_type[0]) { + case PCU_IF_ADDR_TYPE_IPV4: + break; + case PCU_IF_ADDR_TYPE_IPV6: + LOGP(DL1IF, LOGL_ERROR, "This PCU does not support IPv6 NSVC!\n"); + goto bssgp_failed; + default: + LOGP(DL1IF, LOGL_ERROR, "No IPv4 NSVC given!\n"); + goto bssgp_failed; + } + pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0], - info_ind->remote_ip[0], info_ind->remote_port[0], + ntohl(info_ind->remote_ip[0].v4.s_addr), info_ind->remote_port[0], info_ind->nsei, info_ind->nsvci[0], info_ind->bvci, info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac, info_ind->cell_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f Gerrit-Change-Number: 20238 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:08:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 18:08:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: {BTS, PCU}_Tests: bump default PCUIF version: 9 -> 10 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 ) Change subject: {BTS,PCU}_Tests: bump default PCUIF version: 9 -> 10 ...................................................................... {BTS,PCU}_Tests: bump default PCUIF version: 9 -> 10 Both osmo-bts and osmo-pcu are switching to PCUIFv10 soon, so let's use the new version by default. For older (latest) IUT versions not supporting PCUIFv10, one would need to override this module parameter in {BTS,PCU}_Tests.cfg. Change-Id: I9350c4a54434c3d46ce9424f382ca0057e58d053 Related: SYS#4868, SYS#4915 --- M bts/BTS_Tests.default M library/PCUIF_Types.ttcn M pcu/PCU_Tests.default 3 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/20239/1 diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default index 920f5d0..89b04e8 100644 --- a/bts/BTS_Tests.default +++ b/bts/BTS_Tests.default @@ -29,5 +29,6 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS"; +PCUIF_Types.mp_pcuif_version := 10; [EXECUTE] diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 079455f..da50011 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -17,7 +17,7 @@ modulepar { /* PCUIF version supported by the IUT */ - PCUIF_Version mp_pcuif_version := 9; + PCUIF_Version mp_pcuif_version := 10; /* Whether to pad outgoing messages */ boolean mp_pcuif_padding := true; }; diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index 205327d..db4bd58 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -22,6 +22,7 @@ sgsn_role := true } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +PCUIF_Types.mp_pcuif_version := 10; [TESTPORT_PARAMETERS] *.PCU.socket_type := "SEQPACKET" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9350c4a54434c3d46ce9424f382ca0057e58d053 Gerrit-Change-Number: 20239 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 18:10:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 21 Sep 2020 18:10:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: {BTS, PCU}_Tests: bump default PCUIF version: 9 -> 10 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 ) Change subject: {BTS,PCU}_Tests: bump default PCUIF version: 9 -> 10 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9350c4a54434c3d46ce9424f382ca0057e58d053 Gerrit-Change-Number: 20239 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 18:10:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 19:02:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 19:02:24 +0000 Subject: Change in docker-playground[master]: ttcn3-{pcu, bts}-test: use PCUIFv9 for 'latest' images References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20240 ) Change subject: ttcn3-{pcu,bts}-test: use PCUIFv9 for 'latest' images ...................................................................... ttcn3-{pcu,bts}-test: use PCUIFv9 for 'latest' images Change-Id: I6f072e4db07fd6907b91925549edcf62d9c93fb7 Related: I9350c4a54434c3d46ce9424f382ca0057e58d053 Related: SYS#4868, SYS#4915 --- M ttcn3-bts-test/jenkins.sh M ttcn3-pcu-test/jenkins.sh 2 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/20240/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index f544d8a..be6a71c 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -114,11 +114,14 @@ mkdir $VOL_BASE_DIR/bts-tester-hopping cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/ -# Work around for a bug in osmo-bts when all transceivers use IPAC_PROTO_RSL_TRX0. -# Enables patching of IPA stream ID. TODO: remove as soon as we make a new release. +# TODO: revisit this section every time we tag a new release if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" -i \ - "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" + # Work around for a bug in osmo-bts causing all transceivers to use IPAC_PROTO_RSL_TRX0 + sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" \ + -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" + # PCUIFv10 is not yet supported in the latest release + sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ + -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" fi cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 5dedec7..3e0d816 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -19,6 +19,13 @@ mkdir $VOL_BASE_DIR/unix +# TODO: revisit this section every time we tag a new release +if [ "$IMAGE_SUFFIX" = "latest" ]; then + # PCUIFv10 is not yet supported in the latest release + sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ + -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +fi + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f072e4db07fd6907b91925549edcf62d9c93fb7 Gerrit-Change-Number: 20240 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 19:04:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 19:04:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: {BTS, PCU}_Tests: bump default PCUIF version: 9 -> 10 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 ) Change subject: {BTS,PCU}_Tests: bump default PCUIF version: 9 -> 10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9350c4a54434c3d46ce9424f382ca0057e58d053 Gerrit-Change-Number: 20239 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 19:04:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 19:04:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 19:04:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: {BTS, PCU}_Tests: bump default PCUIF version: 9 -> 10 In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 ) Change subject: {BTS,PCU}_Tests: bump default PCUIF version: 9 -> 10 ...................................................................... {BTS,PCU}_Tests: bump default PCUIF version: 9 -> 10 Both osmo-bts and osmo-pcu are switching to PCUIFv10 soon, so let's use the new version by default. For older (latest) IUT versions not supporting PCUIFv10, one would need to override this module parameter in {BTS,PCU}_Tests.cfg. Change-Id: I9350c4a54434c3d46ce9424f382ca0057e58d053 Related: SYS#4868, SYS#4915 --- M bts/BTS_Tests.default M library/PCUIF_Types.ttcn M pcu/PCU_Tests.default 3 files changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default index 920f5d0..89b04e8 100644 --- a/bts/BTS_Tests.default +++ b/bts/BTS_Tests.default @@ -29,5 +29,6 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS"; +PCUIF_Types.mp_pcuif_version := 10; [EXECUTE] diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 079455f..da50011 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -17,7 +17,7 @@ modulepar { /* PCUIF version supported by the IUT */ - PCUIF_Version mp_pcuif_version := 9; + PCUIF_Version mp_pcuif_version := 10; /* Whether to pad outgoing messages */ boolean mp_pcuif_padding := true; }; diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index 205327d..db4bd58 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -22,6 +22,7 @@ sgsn_role := true } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +PCUIF_Types.mp_pcuif_version := 10; [TESTPORT_PARAMETERS] *.PCU.socket_type := "SEQPACKET" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9350c4a54434c3d46ce9424f382ca0057e58d053 Gerrit-Change-Number: 20239 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 19:05:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 19:05:34 +0000 Subject: Change in docker-playground[master]: ttcn3-{pcu, bts}-test: use PCUIFv9 for 'latest' images In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20240 ) Change subject: ttcn3-{pcu,bts}-test: use PCUIFv9 for 'latest' images ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f072e4db07fd6907b91925549edcf62d9c93fb7 Gerrit-Change-Number: 20240 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 19:05:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 19:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 19:05:40 +0000 Subject: Change in docker-playground[master]: ttcn3-{pcu, bts}-test: use PCUIFv9 for 'latest' images In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20240 ) Change subject: ttcn3-{pcu,bts}-test: use PCUIFv9 for 'latest' images ...................................................................... ttcn3-{pcu,bts}-test: use PCUIFv9 for 'latest' images Change-Id: I6f072e4db07fd6907b91925549edcf62d9c93fb7 Related: I9350c4a54434c3d46ce9424f382ca0057e58d053 Related: SYS#4868, SYS#4915 --- M ttcn3-bts-test/jenkins.sh M ttcn3-pcu-test/jenkins.sh 2 files changed, 14 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index f544d8a..be6a71c 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -114,11 +114,14 @@ mkdir $VOL_BASE_DIR/bts-tester-hopping cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/ -# Work around for a bug in osmo-bts when all transceivers use IPAC_PROTO_RSL_TRX0. -# Enables patching of IPA stream ID. TODO: remove as soon as we make a new release. +# TODO: revisit this section every time we tag a new release if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" -i \ - "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" + # Work around for a bug in osmo-bts causing all transceivers to use IPAC_PROTO_RSL_TRX0 + sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" \ + -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" + # PCUIFv10 is not yet supported in the latest release + sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ + -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" fi cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 5dedec7..3e0d816 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -19,6 +19,13 @@ mkdir $VOL_BASE_DIR/unix +# TODO: revisit this section every time we tag a new release +if [ "$IMAGE_SUFFIX" = "latest" ]; then + # PCUIFv10 is not yet supported in the latest release + sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ + -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +fi + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f072e4db07fd6907b91925549edcf62d9c93fb7 Gerrit-Change-Number: 20240 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 19:58:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 19:58:46 +0000 Subject: Change in osmo-bsc[master]: abis_nm: abis_nm_perform_test: fix a potential null deref In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20233 ) Change subject: abis_nm: abis_nm_perform_test: fix a potential null deref ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 Gerrit-Change-Number: 20233 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 19:58:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 20:07:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 20:07:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 2: I believe we should add separate test cases verifying different counters rather than selectively mixing the new checks with the existing test cases. Let me know if I can help with that. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 20:07:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 20:10:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 20:10:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... Patch Set 1: Code-Review-1 > Patch Set 1: > > So, what I mean: Let's drop all those commented lines instead of adding new ones. ACK. You can always get the list of available test cases by executing the test suite this way: $ ./BSC_Tests -l -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 21 Sep 2020 20:10:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 20:12:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 20:12:18 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Avoid calling memcpy with size=0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20230 ) Change subject: osmo_strlcpy: Avoid calling memcpy with size=0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic84af86d33c8a20f06036b13d0a10cf312582f0d Gerrit-Change-Number: 20230 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 20:12:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 21 20:12:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 21 Sep 2020 20:12:47 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Clarify length calculation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20231 ) Change subject: osmo_strlcpy: Clarify length calculation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 Gerrit-Change-Number: 20231 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 21 Sep 2020 20:12:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 22 01:37:35 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 22 Sep 2020 01:37:35 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f69557dd5183_38f12ae4a4af65f02558cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 163s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 163s] [COMPILING libboard/qmod/source/card_pres.c] [ 163s] [COMPILING libboard/qmod/source/wwan_led.c] [ 164s] [COMPILING libboard/qmod/source/i2c.c] [ 164s] [COMPILING libboard/qmod/source/board_qmod.c] [ 164s] [COMPILING apps/dfu/main.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 165s] Memory region Used Size Region Size %age Used [ 165s] rom: 16588 B 16 KB 101.25% [ 165s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 165s] collect2: error: ld returned 1 exit status [ 165s] % [ 165s] make[2]: *** [Makefile:234: flash] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 165s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: error: make -j1 returned exit code 2 [ 165s] make: *** [debian/rules:16: build] Error 25 [ 165s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 165s] ### VM INTERACTION START ### [ 168s] [ 159.534077] sysrq: Power Off [ 168s] [ 159.539739] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] lamb10 failed "build simtrace2_0.7.0.63.39070.dsc" at Tue Sep 22 01:37:27 UTC 2020. [ 168s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Sep 22 06:17:19 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 22 Sep 2020 06:17:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > > Patch Set 1: > > > > So, what I mean: Let's drop all those commented lines instead of adding new ones. > > ACK. You can always get the list of available test cases by executing the test suite this way: > > $ ./BSC_Tests -l Fine with that as well, just want to have it consistent... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 06:17:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 06:17:28 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 22 Sep 2020 06:17:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Add HO tests (as comment) to BSC_Tests.cfg In-Reply-To: References: Message-ID: daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 ) Change subject: bsc: Add HO tests (as comment) to BSC_Tests.cfg ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42c92c20a7dd322d97f07696cfcd334a50bcd8ff Gerrit-Change-Number: 20227 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 06:30:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 06:30:59 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20241 ) Change subject: ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images ...................................................................... ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images Change-Id: Iae0136c453ad14114dae17e8b0e8b5ae2ef8e352 Related: I9350c4a54434c3d46ce9424f382ca0057e58d053 Related: SYS#4868, SYS#4915 --- M ttcn3-pcu-test/jenkins-sns.sh 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/20241/1 diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 9428776..8930885 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -19,6 +19,13 @@ mkdir $VOL_BASE_DIR/unix +# TODO: revisit this section every time we tag a new release +if [ "$IMAGE_SUFFIX" = "latest" ]; then + # PCUIFv10 is not yet supported in the latest release + sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ + -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +fi + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iae0136c453ad14114dae17e8b0e8b5ae2ef8e352 Gerrit-Change-Number: 20241 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 06:31:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 06:31:33 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20241 ) Change subject: ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iae0136c453ad14114dae17e8b0e8b5ae2ef8e352 Gerrit-Change-Number: 20241 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 06:31:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 06:36:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 06:36:30 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20241 ) Change subject: ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images ...................................................................... ttcn3-pcu-test-sns: use PCUIFv9 for 'latest' images Change-Id: Iae0136c453ad14114dae17e8b0e8b5ae2ef8e352 Related: I9350c4a54434c3d46ce9424f382ca0057e58d053 Related: SYS#4868, SYS#4915 --- M ttcn3-pcu-test/jenkins-sns.sh 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 9428776..8930885 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -19,6 +19,13 @@ mkdir $VOL_BASE_DIR/unix +# TODO: revisit this section every time we tag a new release +if [ "$IMAGE_SUFFIX" = "latest" ]; then + # PCUIFv10 is not yet supported in the latest release + sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ + -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +fi + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iae0136c453ad14114dae17e8b0e8b5ae2ef8e352 Gerrit-Change-Number: 20241 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 07:06:50 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 22 Sep 2020 07:06:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Check attempted/successful channel requests In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 to look at the new patch set (#4). Change subject: bsc: Check attempted/successful channel requests ...................................................................... bsc: Check attempted/successful channel requests Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Related: SYS#4877 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/20225/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Gerrit-Change-Number: 20225 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 07:06:50 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 22 Sep 2020 07:06:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 to look at the new patch set (#3). Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... pcu: Check stats for pcu channel allocation, bytes transferred Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Related: SYS#4877 --- M pcu/PCU_Tests.default M pcu/PCU_Tests.ttcn M pcu/gen_links.sh M pcu/osmo-pcu.cfg M pcu/regen_makefile.sh 5 files changed, 64 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/20226/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 07:18:21 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 22 Sep 2020 07:18:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 2: > Patch Set 2: > > I believe we should add separate test cases verifying different counters rather than selectively mixing the new checks with the existing test cases. Let me know if I can help with that. I agree for some counters like uncommon errors. But why shouldn't we verify the counters for regular tests? One reason would be because a counter failure would fail a test that tests the actual functionality while the functionality still works. I'm not sure how often that will happen, though and if/once we trust our counters they can also help verify assumptions made in a testcase. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 07:18:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 09:09:34 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 Sep 2020 09:09:34 +0000 Subject: Change in osmo-bsc[master]: abis_nm: abis_nm_perform_test: fix a potential null deref In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20233 ) Change subject: abis_nm: abis_nm_perform_test: fix a potential null deref ...................................................................... abis_nm: abis_nm_perform_test: fix a potential null deref gcc 10.2.0 warns msgb can be a deref because nm_msgb_alloc() can fail with null. Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 --- M src/osmo-bsc/abis_nm.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index ec52380..4691137 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2193,8 +2193,11 @@ DEBUGP(DNM, "PERFORM TEST %s\n", abis_nm_test_name(test_nr)); - if (!msg) + if (!msg) { msg = nm_msgb_alloc(); + if (!msg) + return -ENOMEM; + } msgb_tv_push(msg, NM_ATT_AUTON_REPORT, auton_report); msgb_tv_push(msg, NM_ATT_TEST_NO, test_nr); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b0e4cd15046272e026cd74c14cbf2972ef6a070 Gerrit-Change-Number: 20233 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 09:32:14 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 09:32:14 +0000 Subject: Change in osmo-bsc[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19670 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19670/6/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19670/6/src/osmo-bsc/bsc_vty.c at 2050 PS6, Line 2050: cfg_net_neci_cmd, These flags are to be interepreted as or connected? What about also setting "BSC_VTY_ATTR_RESTART_FULL" because that also will cause the change to apply? I know that is obvious, but I just wonder about completeness... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51 Gerrit-Change-Number: 19670 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 09:32:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 09:44:13 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 09:44:13 +0000 Subject: Change in osmo-bsc[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19670 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19670/6/src/osmo-bsc/osmo_bsc_main.c File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19670/6/src/osmo-bsc/osmo_bsc_main.c at 653 PS6, Line 653: .usr_attr_letters = { Maybe we could have some standard letters defined in libosmocore for standard situations: F = Full restart required I = Applied Immediately ... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51 Gerrit-Change-Number: 19670 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 09:44:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 10:06:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 10:06:24 +0000 Subject: Change in osmo-bsc[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19670 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 6: (1 comment) Just thought that I could share a few ideas. https://gerrit.osmocom.org/c/osmo-bsc/+/19670/6/include/osmocom/bsc/vty.h File include/osmocom/bsc/vty.h: https://gerrit.osmocom.org/c/osmo-bsc/+/19670/6/include/osmocom/bsc/vty.h at 38 PS6, Line 38: enum bsc_vty_cmd_attr { I just wonder if there could be a VTY_ATTR_RESTART_FULL predefined in libosmore. Almost any of the osmo program will need it. Maybe also an VTY_ATTR_RESTART_IMMEDIATE? Maybe drop the prefix BSC_ - this would also minimze the chance for copy+paste errors. Or maybe keep the prefix to distinguish between pred-defined and custom attrebutes? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51 Gerrit-Change-Number: 19670 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 10:06:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 10:29:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 10:29:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 10:29:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 10:32:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 10:32:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 3: This is an ongoing discussion in lots of places where AFAIU fixeria wants to test only one and one only thing on each test while other people prefer testing all possibles parts are working fine on each scenario. I'm of the opinion we should do the later. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 10:32:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 11:48:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 11:48:52 +0000 Subject: Change in osmo-pcu[master]: gitignore: Add __pychache__ dir References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20242 ) Change subject: gitignore: Add __pychache__ dir ...................................................................... gitignore: Add __pychache__ dir That's created by VTY tests running python. Change-Id: Idb67909ddd5027dbdcbf5a3882d1bb0d4ff9d29e --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/20242/1 diff --git a/.gitignore b/.gitignore index 58be63b..01f4f47 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ # tests .dirstamp +__pycache__/ tests/atconfig tests/package.m4 tests/*/*Test -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idb67909ddd5027dbdcbf5a3882d1bb0d4ff9d29e Gerrit-Change-Number: 20242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 11:48:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 11:48:53 +0000 Subject: Change in osmo-pcu[master]: tbf: Don't log rlcmac_diag() output in separate lines References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20243 ) Change subject: tbf: Don't log rlcmac_diag() output in separate lines ...................................................................... tbf: Don't log rlcmac_diag() output in separate lines Output of all diag in different lines is really confusing, since the user reads a timeout ocurred and then later in another line something like "Downlink ACK was received" while no GSMTAP message shows any ACK. Change-Id: I6a7d79c16c930f0712bc73b308409ececb1946ba --- M src/tbf.cpp M src/tbf.h M tests/tbf/TbfTest.err 3 files changed, 31 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/20243/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 0447edc..9545511 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -20,6 +20,7 @@ */ #include +#include #include #include @@ -647,8 +648,13 @@ LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF\n", get_value_string(tbf_timers_names, t)); - if (run_diag) - tbf->rlcmac_diag(); + if (run_diag) { + LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF: %s\n", + get_value_string(tbf_timers_names, t), tbf->rlcmac_diag().c_str()); + } else { + LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF\n", + get_value_string(tbf_timers_names, t)); + } tbf_free(tbf); } @@ -816,8 +822,9 @@ if (ul_tbf && ul_tbf->handle_ctrl_ack()) { if (!ul_tbf->ctrl_ack_to_toggle()) { - LOGPTBF(this, LOGL_NOTICE, "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ACK\n"); - rlcmac_diag(); + LOGPTBF(this, LOGL_NOTICE, + "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ACK: %s\n", + rlcmac_diag().c_str()); } bts->do_rate_ctr_inc(CTR_RLC_ACK_TIMEDOUT); bts->do_rate_ctr_inc(CTR_PUAN_POLL_TIMEDOUT); @@ -835,8 +842,8 @@ } else if (ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) { if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS))) { LOGPTBF(this, LOGL_NOTICE, - "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT.\n"); - rlcmac_diag(); + "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: %s\n", + rlcmac_diag().c_str()); state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS); } ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE; @@ -854,8 +861,8 @@ } else if (dl_ass_state == GPRS_RLCMAC_DL_ASS_WAIT_ACK) { if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS))) { LOGPTBF(this, LOGL_NOTICE, - "Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT.\n"); - rlcmac_diag(); + "Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: %s\n", + rlcmac_diag().c_str()); state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS); } dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE; @@ -875,8 +882,8 @@ if (!(dl_tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) { LOGPTBF(this, LOGL_NOTICE, - "Timeout for polling PACKET DOWNLINK ACK.\n"); - dl_tbf->rlcmac_diag(); + "Timeout for polling PACKET DOWNLINK ACK: %s\n", + dl_tbf->rlcmac_diag().c_str()); dl_tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK); } @@ -1169,22 +1176,24 @@ } } -int gprs_rlcmac_tbf::rlcmac_diag() +std::string gprs_rlcmac_tbf::rlcmac_diag() { + std::ostringstream os; + os << "|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))) - LOGPTBF(this, LOGL_NOTICE, "Assignment was on CCCH\n"); + os << "Assignment was on CCCH|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))) - LOGPTBF(this, LOGL_NOTICE, "Assignment was on PACCH\n"); + os << "Assignment was on PACCH|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA))) - LOGPTBF(this, LOGL_NOTICE, "Uplink data was received\n"); + os << "Uplink data was received|"; else if (direction == GPRS_RLCMAC_UL_TBF) - LOGPTBF(this, LOGL_NOTICE, "No uplink data received yet\n"); + os << "No uplink data received yet|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))) - LOGPTBF(this, LOGL_NOTICE, "Downlink ACK was received\n"); + os << "Downlink ACK was received|"; else if (direction == GPRS_RLCMAC_DL_TBF) - LOGPTBF(this, LOGL_NOTICE, "No downlink ACK received yet\n"); + os << "No downlink ACK received yet|"; - return 0; + return os.str(); } struct msgb *gprs_rlcmac_tbf::create_dl_ass(uint32_t fn, uint8_t ts) diff --git a/src/tbf.h b/src/tbf.h index 528bee3..99aba67 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -20,6 +20,8 @@ #ifdef __cplusplus +#include + #include "llc.h" #include "rlc.h" #include "cxx_linuxlist.h" @@ -212,7 +214,7 @@ uint8_t tsc() const; - int rlcmac_diag(); + std::string rlcmac_diag(); bool n_inc(enum tbf_counters n); void n_reset(enum tbf_counters n); diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 681e7a3..ce23802 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1725,9 +1725,7 @@ Searching for first unallocated TFI: TRX=0 Found TFI=1. TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654292, TS=7 (curr FN 2654335) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK. -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Assignment was on PACCH -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) No downlink ACK received yet +TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6a7d79c16c930f0712bc73b308409ececb1946ba Gerrit-Change-Number: 20243 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 11:57:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 11:57:03 +0000 Subject: Change in osmo-pcu[master]: gprs_ms_storage.h: Set pointer to NULL instead of 0 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20244 ) Change subject: gprs_ms_storage.h: Set pointer to NULL instead of 0 ...................................................................... gprs_ms_storage.h: Set pointer to NULL instead of 0 Change-Id: If8acd012909c9f452b609e4a804c9a059379f07d --- M src/gprs_ms_storage.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/44/20244/1 diff --git a/src/gprs_ms_storage.h b/src/gprs_ms_storage.h index 14707f5..abd9eaa 100644 --- a/src/gprs_ms_storage.h +++ b/src/gprs_ms_storage.h @@ -38,7 +38,7 @@ virtual void ms_idle(class GprsMs *); virtual void ms_active(class GprsMs *); - GprsMs *get_ms(uint32_t tlli, uint32_t old_tlli = 0, const char *imsi = 0) const; + GprsMs *get_ms(uint32_t tlli, uint32_t old_tlli = 0, const char *imsi = NULL) const; GprsMs *create_ms(); const LListHead& ms_list() const {return m_list;} -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If8acd012909c9f452b609e4a804c9a059379f07d Gerrit-Change-Number: 20244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 12:43:12 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 22 Sep 2020 12:43:12 +0000 Subject: Change in osmo-msc[master]: Don't Store an SMS in the database when the ESME is not Bound In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19935 ) Change subject: Don't Store an SMS in the database when the ESME is not Bound ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Gerrit-Change-Number: 19935 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 12:43:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 12:43:14 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 22 Sep 2020 12:43:14 +0000 Subject: Change in osmo-msc[master]: Don't Store an SMS in the database when the ESME is not Bound In-Reply-To: References: Message-ID: keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19935 ) Change subject: Don't Store an SMS in the database when the ESME is not Bound ...................................................................... Don't Store an SMS in the database when the ESME is not Bound We may never be able to deliver this SMS if it depends on the ESME, as we will not resubmit the SMS to the ESME. Better to reject it at this time and have the MS try again later. Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Related: OS#4740 --- M src/libmsc/gsm_04_11.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve keith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 5c26929..e5063dc 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -633,6 +633,16 @@ if (gsms->smpp.esme) { return -EINPROGRESS; } + + /* This SMS got routed through SMPP, but the configured ESME was + * unavailable at this time. This is an OOO condition. + * Don't store this SMS in the database as we may never be + * able to deliver it. (we would need to process the stored SMS and + * attempt re-submission to the ESME) + */ + if (rc == GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER) + return rc; + /* * This SMS got routed through SMPP or no receiver exists. * In any case, we store it in the database for further processing. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c50904349dd4ed229b60b8468d776b817c0bd44 Gerrit-Change-Number: 19935 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:00:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 14:00:38 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Free all MS TBFs when receiving GPRS Suspension Request Otherwise, if there's DL data queued in the PCU for TBFs related to the MS sending the GPRS Suspension Request, then the PCU will continue sending DL data and nobody will Otherwise the TBFs are kept, and hence PCU will continue reserving resources and DL data queued will still be sent over the air, despite the MS not listening anymore on the PDCH. Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 --- M src/pcu_l1_if.cpp 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/45/20245/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 21eacfd..535fb70 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -49,6 +49,8 @@ #include #include #include +#include +#include // FIXME: move this, when changed from c++ to c. extern "C" { @@ -730,7 +732,11 @@ static int pcu_rx_susp_req(struct gsm_pcu_if_susp_req *susp_req) { + BTS *bts = BTS::main_bts(); struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx(); + GprsMs *ms; + struct gprs_rlcmac_dl_tbf *dl_tbf; + struct gprs_rlcmac_ul_tbf *ul_tbf; struct gprs_ra_id ra_id; gsm48_parse_ra(&ra_id, susp_req->ra_id); @@ -738,6 +744,17 @@ LOGP(DL1IF, LOGL_INFO, "GPRS Suspend request received: TLLI=0x%08x RAI=%s\n", susp_req->tlli, osmo_rai_name(&ra_id)); + if ((ms = bts->ms_store().get_ms(susp_req->tlli))) { + /* We need to catch both pointers here since MS may become freed + after first tbf_free(dl_tbf) if only DL TBF was available */ + dl_tbf = ms->dl_tbf(); + ul_tbf = ms->ul_tbf(); + if (dl_tbf) + tbf_free(dl_tbf); + if (ul_tbf) + tbf_free(ul_tbf); + } + if (!bctx) return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:16:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 14:16:02 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix indentation alignment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20246 ) Change subject: cosmetic: fix indentation alignment ...................................................................... cosmetic: fix indentation alignment Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 --- M src/pcu_vty_functions.cpp 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/20246/1 diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 97241e1..3e9973c 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -50,19 +50,19 @@ gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) TA=%u DIR=%s IMSI=%s%s", tbf->tfi(), - tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid", - tbf->ta(), - tbf->direction == GPRS_RLCMAC_UL_TBF ? "UL" : "DL", - tbf->imsi(), VTY_NEWLINE); + tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid", + tbf->ta(), + tbf->direction == GPRS_RLCMAC_UL_TBF ? "UL" : "DL", + tbf->imsi(), VTY_NEWLINE); vty_out(vty, " created=%lu state=%08x [CCCH:%u, PACCH:%u] 1st_TS=%d 1st_cTS=%d ctrl_TS=%d MS_CLASS=%d/%d%s", tbf->created_ts(), tbf->state_flags, tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH), tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH), tbf->first_ts, - tbf->first_common_ts, tbf->control_ts, - tbf->ms_class(), - tbf->ms() ? tbf->ms()->egprs_ms_class() : -1, - VTY_NEWLINE); + tbf->first_common_ts, tbf->control_ts, + tbf->ms_class(), + tbf->ms() ? tbf->ms()->egprs_ms_class() : -1, + VTY_NEWLINE); vty_out(vty, " TS_alloc="); for (int i = 0; i < 8; i++) { bool is_ctrl = tbf->is_control_ts(i); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 Gerrit-Change-Number: 20246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:25:45 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 14:25:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: remove remains of loopback functionality References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20247 ) Change subject: mgcp_vty: remove remains of loopback functionality ...................................................................... mgcp_vty: remove remains of loopback functionality There exist trunk_loop commands, which sets an trunk->audio_loop variable, however all it does is to turn on a log message. There is no actual implementation present. Lets set the VTY commands to DEFUN_DEPRECATED and remove the variable. Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 8 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/47/20247/1 diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 1002adb..8127181 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -24,7 +24,6 @@ char *audio_fmtp_extra; int audio_send_ptime; int audio_send_name; - int audio_loop; int no_audio_transcoding; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index fa40f1f..b452201 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -893,10 +893,6 @@ LOGPENDP(endp, DRTP, LOGL_DEBUG, "delivering RTCP packet...\n"); } - LOGPENDP(endp, DRTP, LOGL_DEBUG, "loop:%d, mode:%d%s\n", - trunk->audio_loop, conn_src->conn->mode, - conn_src->conn->mode == MGCP_CONN_LOOPBACK ? " (loopback)" : ""); - /* FIXME: It is legal that the payload type on the egress connection is * different from the payload type that has been negotiated on the * ingress connection. Essentially the codecs are the same so we can diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index aa27d41..cc7c5b8 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -115,7 +115,6 @@ trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-name%s", trunk->audio_send_name ? "" : "no ", VTY_NEWLINE); - vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE); vty_out(vty, " number endpoints %u%s", trunk->v.vty_number_endpoints, VTY_NEWLINE); vty_out(vty, " %sallow-transcoding%s", @@ -712,18 +711,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_loop, - cfg_mgcp_loop_cmd, - "loop (0|1)", - "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n") +DEFUN_DEPRECATED(cfg_mgcp_loop, + cfg_mgcp_loop_cmd, + "loop (0|1)", + "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - OSMO_ASSERT(trunk); - if (g_cfg->osmux) { - vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); - return CMD_WARNING; - } - trunk->audio_loop = atoi(argv[0]); return CMD_SUCCESS; } @@ -947,7 +939,6 @@ trunk->keepalive_interval, VTY_NEWLINE); else vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE); - vty_out(vty, " loop %d%s", trunk->audio_loop, VTY_NEWLINE); vty_out(vty, " force-realloc %d%s", trunk->force_realloc, VTY_NEWLINE); vty_out(vty, " rtp-accept-all %d%s", @@ -1019,18 +1010,11 @@ "sdp audio payload name NAME", SDP_STR AUDIO_STR AUDIO_STR "Payload\n" "Payload Name\n") -DEFUN(cfg_trunk_loop, - cfg_trunk_loop_cmd, - "loop (0|1)", - "Loop audio for all endpoints on this trunk\n" "Don't Loop\n" "Loop\n") +DEFUN_DEPRECATED(cfg_trunk_loop, + cfg_trunk_loop_cmd, + "loop (0|1)", + "Loop audio for all endpoints on this trunk\n" "Don't Loop\n" "Loop\n") { - struct mgcp_trunk *trunk = vty->index; - - if (g_cfg->osmux) { - vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); - return CMD_WARNING; - } - trunk->audio_loop = atoi(argv[0]); return CMD_SUCCESS; } @@ -1445,11 +1429,6 @@ else if (strcmp(argv[0], "only") == 0) g_cfg->osmux = OSMUX_USAGE_ONLY; - if (trunk->audio_loop) { - vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); - return CMD_WARNING; - } - return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1 Gerrit-Change-Number: 20247 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:25:49 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 14:25:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: deprecate bind early command References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20248 ) Change subject: mgcp_vty: deprecate bind early command ...................................................................... mgcp_vty: deprecate bind early command The VTY command "bind early" is deprecated but it prints an error message and the DEFUN is not set to DEFUN_DEPRECATED. Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/48/20248/1 diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index cc7c5b8..1df69c6 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -442,13 +442,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_bind_early, - cfg_mgcp_bind_early_cmd, - "bind early (0|1)", - BIND_STR - "Bind local ports on start up\n" "Bind on demand\n" "Bind on startup\n") +DEFUN_DEPRECATED(cfg_mgcp_bind_early, + cfg_mgcp_bind_early_cmd, + "bind early (0|1)", + BIND_STR + "Bind local ports on start up\n" "Bind on demand\n" "Bind on startup\n") { - vty_out(vty, "bind early is deprecated, remove it from the config.\n"); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 Gerrit-Change-Number: 20248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:25:49 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 14:25:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_e1: do not expose function mgcp_e1_init() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20249 ) Change subject: mgcp_e1: do not expose function mgcp_e1_init() ...................................................................... mgcp_e1: do not expose function mgcp_e1_init() The initialization of the E1 line in mgcp_e1.c is controlled internally, there is no need to expose the function mgcp_e1_init(), lets make it static and remove the prefix mgcp_ Change-Id: I6aba1c55c9b1d729709ee1fba2994c77bd848a9b --- M include/osmocom/mgcp/mgcp_e1.h M src/libosmo-mgcp/mgcp_e1.c 2 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/49/20249/1 diff --git a/include/osmocom/mgcp/mgcp_e1.h b/include/osmocom/mgcp/mgcp_e1.h index a4ae854..f0cf3ec 100644 --- a/include/osmocom/mgcp/mgcp_e1.h +++ b/include/osmocom/mgcp/mgcp_e1.h @@ -21,7 +21,6 @@ static const uint8_t e1_rates[] = { 64, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8 }; static const uint8_t e1_offsets[] = { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; -int mgcp_e1_init(struct mgcp_trunk *trunk, uint8_t ts_nr); int mgcp_e1_endp_equip(struct mgcp_endpoint *endp, uint8_t ts, uint8_t ss, uint8_t offs); void mgcp_e1_endp_update(struct mgcp_endpoint *endp); void mgcp_e1_endp_release(struct mgcp_endpoint *endp); diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index 50a2d85..7d4a29e 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -361,11 +361,7 @@ e1_send(ts, trunk); } -/*! Find an endpoint by its name on a specified trunk. - * \param[in] trunk trunk configuration. - * \param[in] ts_nr E1 timeslot number. - * \returns -EINVAL on failure, 0 on success. */ -int mgcp_e1_init(struct mgcp_trunk *trunk, uint8_t ts_nr) +static int e1_init(struct mgcp_trunk *trunk, uint8_t ts_nr) { /*! Each timeslot needs only to be configured once. The Timeslot then * stays open and permanently receives data. It is then up to the @@ -517,7 +513,7 @@ endp->e1.last_amr_ft = AMR_4_75; /* Set up E1 line / timeslot */ - rc = mgcp_e1_init(endp->trunk, ts); + rc = e1_init(endp->trunk, ts); if (rc != 0) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6aba1c55c9b1d729709ee1fba2994c77bd848a9b Gerrit-Change-Number: 20249 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:25:49 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 14:25:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20250 ) Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... mgcp_vty: add user attributes to configuration commands To make clear which configuration changes (configure terminal) apply when, add appropriate user attributes to VTY commands. Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Related: SYS#4937 --- M include/osmocom/mgcp/vty.h M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c 3 files changed, 295 insertions(+), 211 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/20250/1 diff --git a/include/osmocom/mgcp/vty.h b/include/osmocom/mgcp/vty.h index bf6b7a8..2fe4953 100644 --- a/include/osmocom/mgcp/vty.h +++ b/include/osmocom/mgcp/vty.h @@ -6,3 +6,9 @@ MGCP_NODE = _LAST_OSMOVTY_NODE + 1, TRUNK_NODE, }; + +enum mgw_vty_cmd_attr { + MGW_VTY_ATTR_RESTART_FULL = 0, + MGW_VTY_ATTR_IMMEDIATE, + MGW_VTY_ATTR_NEW_CONN, +}; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 1df69c6..293856e 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -42,6 +42,7 @@ #define RTP_KEEPALIVE_STR "Send dummy UDP packet to net RTP destination\n" #define RTP_TS101318_RFC5993_CONV_STR "Convert GSM-HR from TS101318 to RFC5993 and vice versa\n" +#define X(x) (1 << x) static struct mgcp_config *g_cfg = NULL; @@ -408,34 +409,37 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_local_ip, - cfg_mgcp_local_ip_cmd, - "local ip " VTY_IPV46_CMD, - "Local options for the SDP record\n" - IP_STR - "IPv4 Address to use in SDP record\n" - "IPv6 Address to use in SDP record\n") +DEFUN_USRATTR(cfg_mgcp_local_ip, + cfg_mgcp_local_ip_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "local ip " VTY_IPV46_CMD, + "Local options for the SDP record\n" + IP_STR + "IPv4 Address to use in SDP record\n" + "IPv6 Address to use in SDP record\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->local_ip, argv[0]); return CMD_SUCCESS; } #define BIND_STR "Listen/Bind related socket option\n" -DEFUN(cfg_mgcp_bind_ip, - cfg_mgcp_bind_ip_cmd, - "bind ip " VTY_IPV46_CMD, - BIND_STR IP_STR - "IPv4 Address to bind to\n" - "IPv6 Address to bind to\n") +DEFUN_USRATTR(cfg_mgcp_bind_ip, + cfg_mgcp_bind_ip_cmd, + X(MGW_VTY_ATTR_RESTART_FULL), + "bind ip " VTY_IPV46_CMD, + BIND_STR IP_STR + "IPv4 Address to bind to\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->source_addr, argv[0]); return CMD_SUCCESS; } -DEFUN(cfg_mgcp_bind_port, - cfg_mgcp_bind_port_cmd, - "bind port <0-65534>", - BIND_STR "Port information\n" "UDP port to listen for MGCP messages\n") +DEFUN_USRATTR(cfg_mgcp_bind_port, + cfg_mgcp_bind_port_cmd, + X(MGW_VTY_ATTR_RESTART_FULL), + "bind port <0-65534>", + BIND_STR "Port information\n" "UDP port to listen for MGCP messages\n") { unsigned int port = atoi(argv[0]); g_cfg->source_port = port; @@ -457,11 +461,12 @@ #define RANGE_START_STR "Start of the range of ports\n" #define RANGE_END_STR "End of the range of ports\n" -DEFUN(cfg_mgcp_rtp_port_range, - cfg_mgcp_rtp_port_range_cmd, - "rtp port-range <1024-65534> <1025-65535>", - RTP_STR "Range of ports to use for the NET side\n" - RANGE_START_STR RANGE_END_STR) +DEFUN_USRATTR(cfg_mgcp_rtp_port_range, + cfg_mgcp_rtp_port_range_cmd, + X(MGW_VTY_ATTR_RESTART_FULL), + "rtp port-range <1024-65534> <1025-65535>", + RTP_STR "Range of ports to use for the NET side\n" + RANGE_START_STR RANGE_END_STR) { int start; int end; @@ -499,11 +504,12 @@ RTP_STR "Range of ports to use for the NET side\n" RANGE_START_STR RANGE_END_STR) -DEFUN(cfg_mgcp_rtp_bind_ip, - cfg_mgcp_rtp_bind_ip_cmd, - "rtp bind-ip A.B.C.D", - RTP_STR "Bind endpoints facing the Network\n" - "IPv4 Address to bind to\n") +DEFUN_USRATTR(cfg_mgcp_rtp_bind_ip, + cfg_mgcp_rtp_bind_ip_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp bind-ip A.B.C.D", + RTP_STR "Bind endpoints facing the Network\n" + "IPv4 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v4, argv[0]); return CMD_SUCCESS; @@ -513,11 +519,12 @@ "rtp net-bind-ip A.B.C.D", RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") -DEFUN(cfg_mgcp_rtp_no_bind_ip, - cfg_mgcp_rtp_no_bind_ip_cmd, - "no rtp bind-ip", - NO_STR RTP_STR "Bind endpoints facing the Network\n" - "Address to bind to\n") +DEFUN_USRATTR(cfg_mgcp_rtp_no_bind_ip, + cfg_mgcp_rtp_no_bind_ip_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp bind-ip", + NO_STR RTP_STR "Bind endpoints facing the Network\n" + "Address to bind to\n") { talloc_free(g_cfg->net_ports.bind_addr_v4); g_cfg->net_ports.bind_addr_v4 = NULL; @@ -529,50 +536,55 @@ NO_STR RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n") -DEFUN(cfg_mgcp_rtp_bind_ip_v6, - cfg_mgcp_rtp_bind_ip_v6_cmd, - "rtp bind-ip-v6 " VTY_IPV6_CMD, - RTP_STR "Bind endpoints facing the Network\n" - "IPv6 Address to bind to\n") +DEFUN_USRATTR(cfg_mgcp_rtp_bind_ip_v6, + cfg_mgcp_rtp_bind_ip_v6_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp bind-ip-v6 " VTY_IPV6_CMD, + RTP_STR "Bind endpoints facing the Network\n" + "IPv6 Address to bind to\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v6, argv[0]); return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_no_bind_ip_v6, -cfg_mgcp_rtp_no_bind_ip_v6_cmd, -"no rtp bind-ip-v6", -NO_STR RTP_STR "Bind endpoints facing the Network\n" -"Address to bind to\n") +DEFUN_USRATTR(cfg_mgcp_rtp_no_bind_ip_v6, + cfg_mgcp_rtp_no_bind_ip_v6_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp bind-ip-v6", + NO_STR RTP_STR "Bind endpoints facing the Network\n" + "Address to bind to\n") { talloc_free(g_cfg->net_ports.bind_addr_v6); g_cfg->net_ports.bind_addr_v6 = NULL; return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_net_bind_ip_probing, - cfg_mgcp_rtp_net_bind_ip_probing_cmd, - "rtp ip-probing", - RTP_STR "automatic rtp bind ip selection\n") +DEFUN_USRATTR(cfg_mgcp_rtp_net_bind_ip_probing, + cfg_mgcp_rtp_net_bind_ip_probing_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp ip-probing", + RTP_STR "automatic rtp bind ip selection\n") { g_cfg->net_ports.bind_addr_probe = true; return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_no_net_bind_ip_probing, - cfg_mgcp_rtp_no_net_bind_ip_probing_cmd, - "no rtp ip-probing", - NO_STR RTP_STR "no automatic rtp bind ip selection\n") +DEFUN_USRATTR(cfg_mgcp_rtp_no_net_bind_ip_probing, + cfg_mgcp_rtp_no_net_bind_ip_probing_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp ip-probing", + NO_STR RTP_STR "no automatic rtp bind ip selection\n") { g_cfg->net_ports.bind_addr_probe = false; return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_ip_dscp, - cfg_mgcp_rtp_ip_dscp_cmd, - "rtp ip-dscp <0-255>", - RTP_STR - "Apply IP_TOS to the audio stream (including Osmux)\n" "The DSCP value\n") +DEFUN_USRATTR(cfg_mgcp_rtp_ip_dscp, + cfg_mgcp_rtp_ip_dscp_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp ip-dscp <0-255>", + RTP_STR + "Apply IP_TOS to the audio stream (including Osmux)\n" "The DSCP value\n") { int dscp = atoi(argv[0]); g_cfg->endp_dscp = dscp; @@ -584,29 +596,32 @@ RTP_STR "Apply IP_TOS to the audio stream\n" "The DSCP value\n") #define FORCE_PTIME_STR "Force a fixed ptime for packets sent" -DEFUN(cfg_mgcp_rtp_force_ptime, - cfg_mgcp_rtp_force_ptime_cmd, - "rtp force-ptime (10|20|40)", - RTP_STR FORCE_PTIME_STR - "The required ptime (packet duration) in ms\n" "10 ms\n20 ms\n40 ms\n") +DEFUN_USRATTR(cfg_mgcp_rtp_force_ptime, + cfg_mgcp_rtp_force_ptime_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp force-ptime (10|20|40)", + RTP_STR FORCE_PTIME_STR + "The required ptime (packet duration) in ms\n" "10 ms\n20 ms\n40 ms\n") { g_cfg->force_ptime = atoi(argv[0]); return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_rtp_force_ptime, - cfg_mgcp_no_rtp_force_ptime_cmd, - "no rtp force-ptime", NO_STR RTP_STR FORCE_PTIME_STR) +DEFUN_USRATTR(cfg_mgcp_no_rtp_force_ptime, + cfg_mgcp_no_rtp_force_ptime_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp force-ptime", NO_STR RTP_STR FORCE_PTIME_STR) { g_cfg->force_ptime = 0; return CMD_SUCCESS; } -DEFUN(cfg_mgcp_sdp_fmtp_extra, - cfg_mgcp_sdp_fmtp_extra_cmd, - "sdp audio fmtp-extra .NAME", - "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" - "Extra Information\n") +DEFUN_USRATTR(cfg_mgcp_sdp_fmtp_extra, + cfg_mgcp_sdp_fmtp_extra_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "sdp audio fmtp-extra .NAME", + "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" + "Extra Information\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -619,9 +634,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_allow_transcoding, - cfg_mgcp_allow_transcoding_cmd, - "allow-transcoding", "Allow transcoding\n") +DEFUN_USRATTR(cfg_mgcp_allow_transcoding, + cfg_mgcp_allow_transcoding_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "allow-transcoding", "Allow transcoding\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -629,9 +645,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_allow_transcoding, - cfg_mgcp_no_allow_transcoding_cmd, - "no allow-transcoding", NO_STR "Allow transcoding\n") +DEFUN_USRATTR(cfg_mgcp_no_allow_transcoding, + cfg_mgcp_no_allow_transcoding_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no allow-transcoding", NO_STR "Allow transcoding\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -666,10 +683,11 @@ "sdp audio payload name NAME", SDP_STR AUDIO_STR AUDIO_STR "Name\n" "Payload name\n") -DEFUN(cfg_mgcp_sdp_payload_send_ptime, - cfg_mgcp_sdp_payload_send_ptime_cmd, - "sdp audio-payload send-ptime", - SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") +DEFUN_USRATTR(cfg_mgcp_sdp_payload_send_ptime, + cfg_mgcp_sdp_payload_send_ptime_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "sdp audio-payload send-ptime", + SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -677,10 +695,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_sdp_payload_send_ptime, - cfg_mgcp_no_sdp_payload_send_ptime_cmd, - "no sdp audio-payload send-ptime", - NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") +DEFUN_USRATTR(cfg_mgcp_no_sdp_payload_send_ptime, + cfg_mgcp_no_sdp_payload_send_ptime_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no sdp audio-payload send-ptime", + NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -688,10 +707,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_sdp_payload_send_name, - cfg_mgcp_sdp_payload_send_name_cmd, - "sdp audio-payload send-name", - SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") +DEFUN_USRATTR(cfg_mgcp_sdp_payload_send_name, + cfg_mgcp_sdp_payload_send_name_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "sdp audio-payload send-name", + SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -699,10 +719,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_sdp_payload_send_name, - cfg_mgcp_no_sdp_payload_send_name_cmd, - "no sdp audio-payload send-name", - NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") +DEFUN_USRATTR(cfg_mgcp_no_sdp_payload_send_name, + cfg_mgcp_no_sdp_payload_send_name_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no sdp audio-payload send-name", + NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -718,11 +739,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_force_realloc, - cfg_mgcp_force_realloc_cmd, - "force-realloc (0|1)", - "Force endpoint reallocation when the endpoint is still seized\n" - "Don't force reallocation\n" "force reallocation\n") +DEFUN_USRATTR(cfg_mgcp_force_realloc, + cfg_mgcp_force_realloc_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "force-realloc (0|1)", + "Force endpoint reallocation when the endpoint is still seized\n" + "Don't force reallocation\n" "force reallocation\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -730,11 +752,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_accept_all, - cfg_mgcp_rtp_accept_all_cmd, - "rtp-accept-all (0|1)", - "Accept all RTP packets, even when the originating IP/Port does not match\n" - "enable filter\n" "disable filter\n") +DEFUN_USRATTR(cfg_mgcp_rtp_accept_all, + cfg_mgcp_rtp_accept_all_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "rtp-accept-all (0|1)", + "Accept all RTP packets, even when the originating IP/Port does not match\n" + "enable filter\n" "disable filter\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -742,10 +765,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_number_endp, - cfg_mgcp_number_endp_cmd, - "number endpoints <1-65534>", - "Number options\n" "Endpoints available\n" "Number endpoints\n") +DEFUN_USRATTR(cfg_mgcp_number_endp, + cfg_mgcp_number_endp_cmd, + X(MGW_VTY_ATTR_RESTART_FULL), + "number endpoints <1-65534>", + "Number options\n" "Endpoints available\n" "Number endpoints\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -753,15 +777,21 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_omit_rtcp, cfg_mgcp_omit_rtcp_cmd, "rtcp-omit", RTCP_OMIT_STR) +DEFUN_USRATTR(cfg_mgcp_omit_rtcp, + cfg_mgcp_omit_rtcp_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "rtcp-omit", RTCP_OMIT_STR) { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->omit_rtcp = 1; return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_omit_rtcp, - cfg_mgcp_no_omit_rtcp_cmd, "no rtcp-omit", NO_STR RTCP_OMIT_STR) +DEFUN_USRATTR(cfg_mgcp_no_omit_rtcp, + cfg_mgcp_no_omit_rtcp_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "no rtcp-omit", + NO_STR RTCP_OMIT_STR) { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -769,9 +799,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_patch_rtp_ssrc, - cfg_mgcp_patch_rtp_ssrc_cmd, - "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n") +DEFUN_USRATTR(cfg_mgcp_patch_rtp_ssrc, + cfg_mgcp_patch_rtp_ssrc_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -779,9 +810,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_patch_rtp_ssrc, - cfg_mgcp_no_patch_rtp_ssrc_cmd, - "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n") +DEFUN_USRATTR(cfg_mgcp_no_patch_rtp_ssrc, + cfg_mgcp_no_patch_rtp_ssrc_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -789,9 +821,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_patch_rtp_ts, - cfg_mgcp_patch_rtp_ts_cmd, - "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n") +DEFUN_USRATTR(cfg_mgcp_patch_rtp_ts, + cfg_mgcp_patch_rtp_ts_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -799,9 +832,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_patch_rtp_ts, - cfg_mgcp_no_patch_rtp_ts_cmd, - "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n") +DEFUN_USRATTR(cfg_mgcp_no_patch_rtp_ts, + cfg_mgcp_no_patch_rtp_ts_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -809,9 +843,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_patch_rtp_rfc5993hr, - cfg_mgcp_patch_rtp_rfc5993hr_cmd, - "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) +DEFUN_USRATTR(cfg_mgcp_patch_rtp_rfc5993hr, + cfg_mgcp_patch_rtp_rfc5993hr_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -819,9 +854,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_patch_rtp_rfc5993hr, - cfg_mgcp_no_patch_rtp_rfc5993hr_cmd, - "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) +DEFUN_USRATTR(cfg_mgcp_no_patch_rtp_rfc5993hr, + cfg_mgcp_no_patch_rtp_rfc5993hr_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -829,8 +865,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_patch_rtp, - cfg_mgcp_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR) +DEFUN_USRATTR(cfg_mgcp_no_patch_rtp, + cfg_mgcp_no_patch_rtp_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch", NO_STR RTP_PATCH_STR) { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -840,10 +878,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_keepalive, - cfg_mgcp_rtp_keepalive_cmd, - "rtp keep-alive <1-120>", - RTP_STR RTP_KEEPALIVE_STR "Keep alive interval in secs\n") +DEFUN_USRATTR(cfg_mgcp_rtp_keepalive, + cfg_mgcp_rtp_keepalive_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "rtp keep-alive <1-120>", + RTP_STR RTP_KEEPALIVE_STR "Keep alive interval in secs\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -851,10 +890,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_keepalive_once, - cfg_mgcp_rtp_keepalive_once_cmd, - "rtp keep-alive once", - RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n") +DEFUN_USRATTR(cfg_mgcp_rtp_keepalive_once, + cfg_mgcp_rtp_keepalive_once_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "rtp keep-alive once", + RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -862,9 +902,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_no_rtp_keepalive, - cfg_mgcp_no_rtp_keepalive_cmd, - "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR) +DEFUN_USRATTR(cfg_mgcp_no_rtp_keepalive, + cfg_mgcp_no_rtp_keepalive_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR) { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); @@ -873,12 +914,13 @@ } #define CALL_AGENT_STR "Call agent information\n" -DEFUN(cfg_mgcp_agent_addr, - cfg_mgcp_agent_addr_cmd, - "call-agent ip " VTY_IPV46_CMD, - CALL_AGENT_STR IP_STR - "IPv4 Address of the call agent\n" - "IPv6 Address of the call agent\n") +DEFUN_USRATTR(cfg_mgcp_agent_addr, + cfg_mgcp_agent_addr_cmd, + X(MGW_VTY_ATTR_RESTART_FULL), + "call-agent ip " VTY_IPV46_CMD, + CALL_AGENT_STR IP_STR + "IPv4 Address of the call agent\n" + "IPv6 Address of the call agent\n") { osmo_talloc_replace_string(g_cfg, &g_cfg->call_agent_addr, argv[0]); return CMD_SUCCESS; @@ -889,8 +931,10 @@ CALL_AGENT_STR CALL_AGENT_STR IP_STR "IPv4 Address of the callagent\n") -DEFUN(cfg_mgcp_trunk, cfg_mgcp_trunk_cmd, - "trunk <0-64>", "Configure a SS7 trunk\n" "Trunk Nr\n") +DEFUN_USRATTR(cfg_mgcp_trunk, + cfg_mgcp_trunk_cmd, + X(MGW_VTY_ATTR_RESTART_FULL), + "trunk <0-64>", "Configure a SS7 trunk\n" "Trunk Nr\n") { struct mgcp_trunk *trunk; int index = atoi(argv[0]); @@ -969,11 +1013,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_trunk_sdp_fmtp_extra, - cfg_trunk_sdp_fmtp_extra_cmd, - "sdp audio fmtp-extra .NAME", - "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" - "Extra Information\n") +DEFUN_USRATTR(cfg_trunk_sdp_fmtp_extra, + cfg_trunk_sdp_fmtp_extra_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "sdp audio fmtp-extra .NAME", + "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" + "Extra Information\n") { struct mgcp_trunk *trunk = vty->index; char *txt = argv_concat(argv, argc, 0); @@ -1017,117 +1062,134 @@ return CMD_SUCCESS; } -DEFUN(cfg_trunk_sdp_payload_send_ptime, - cfg_trunk_sdp_payload_send_ptime_cmd, - "sdp audio-payload send-ptime", - SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") +DEFUN_USRATTR(cfg_trunk_sdp_payload_send_ptime, + cfg_trunk_sdp_payload_send_ptime_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "sdp audio-payload send-ptime", + SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { struct mgcp_trunk *trunk = vty->index; trunk->audio_send_ptime = 1; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_sdp_payload_send_ptime, - cfg_trunk_no_sdp_payload_send_ptime_cmd, - "no sdp audio-payload send-ptime", - NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") +DEFUN_USRATTR(cfg_trunk_no_sdp_payload_send_ptime, + cfg_trunk_no_sdp_payload_send_ptime_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no sdp audio-payload send-ptime", + NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { struct mgcp_trunk *trunk = vty->index; trunk->audio_send_ptime = 0; return CMD_SUCCESS; } -DEFUN(cfg_trunk_sdp_payload_send_name, - cfg_trunk_sdp_payload_send_name_cmd, - "sdp audio-payload send-name", - SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") +DEFUN_USRATTR(cfg_trunk_sdp_payload_send_name, + cfg_trunk_sdp_payload_send_name_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "sdp audio-payload send-name", + SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { struct mgcp_trunk *trunk = vty->index; trunk->audio_send_name = 1; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_sdp_payload_send_name, - cfg_trunk_no_sdp_payload_send_name_cmd, - "no sdp audio-payload send-name", - NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") +DEFUN_USRATTR(cfg_trunk_no_sdp_payload_send_name, + cfg_trunk_no_sdp_payload_send_name_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no sdp audio-payload send-name", + NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { struct mgcp_trunk *trunk = vty->index; trunk->audio_send_name = 0; return CMD_SUCCESS; } -DEFUN(cfg_trunk_omit_rtcp, cfg_trunk_omit_rtcp_cmd, "rtcp-omit", RTCP_OMIT_STR) +DEFUN_USRATTR(cfg_trunk_omit_rtcp, + cfg_trunk_omit_rtcp_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "rtcp-omit", RTCP_OMIT_STR) { struct mgcp_trunk *trunk = vty->index; trunk->omit_rtcp = 1; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_omit_rtcp, - cfg_trunk_no_omit_rtcp_cmd, "no rtcp-omit", NO_STR RTCP_OMIT_STR) +DEFUN_USRATTR(cfg_trunk_no_omit_rtcp, + cfg_trunk_no_omit_rtcp_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "no rtcp-omit", NO_STR RTCP_OMIT_STR) { struct mgcp_trunk *trunk = vty->index; trunk->omit_rtcp = 0; return CMD_SUCCESS; } -DEFUN(cfg_trunk_patch_rtp_ssrc, - cfg_trunk_patch_rtp_ssrc_cmd, - "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n") +DEFUN_USRATTR(cfg_trunk_patch_rtp_ssrc, + cfg_trunk_patch_rtp_ssrc_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n") { struct mgcp_trunk *trunk = vty->index; trunk->force_constant_ssrc = 1; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_patch_rtp_ssrc, - cfg_trunk_no_patch_rtp_ssrc_cmd, - "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n") +DEFUN_USRATTR(cfg_trunk_no_patch_rtp_ssrc, + cfg_trunk_no_patch_rtp_ssrc_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n") { struct mgcp_trunk *trunk = vty->index; trunk->force_constant_ssrc = 0; return CMD_SUCCESS; } -DEFUN(cfg_trunk_patch_rtp_ts, - cfg_trunk_patch_rtp_ts_cmd, - "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n") +DEFUN_USRATTR(cfg_trunk_patch_rtp_ts, + cfg_trunk_patch_rtp_ts_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n") { struct mgcp_trunk *trunk = vty->index; trunk->force_aligned_timing = 1; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_patch_rtp_ts, - cfg_trunk_no_patch_rtp_ts_cmd, - "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n") +DEFUN_USRATTR(cfg_trunk_no_patch_rtp_ts, + cfg_trunk_no_patch_rtp_ts_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n") { struct mgcp_trunk *trunk = vty->index; trunk->force_aligned_timing = 0; return CMD_SUCCESS; } -DEFUN(cfg_trunk_patch_rtp_rfc5993hr, - cfg_trunk_patch_rtp_rfc5993hr_cmd, - "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) +DEFUN_USRATTR(cfg_trunk_patch_rtp_rfc5993hr, + cfg_trunk_patch_rtp_rfc5993hr_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { struct mgcp_trunk *trunk = vty->index; trunk->rfc5993_hr_convert = true; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_patch_rtp_rfc5993hr, - cfg_trunk_no_patch_rtp_rfc5993hr_cmd, - "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) +DEFUN_USRATTR(cfg_trunk_no_patch_rtp_rfc5993hr, + cfg_trunk_no_patch_rtp_rfc5993hr_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { struct mgcp_trunk *trunk = vty->index; trunk->rfc5993_hr_convert = false; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_patch_rtp, - cfg_trunk_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR) +DEFUN_USRATTR(cfg_trunk_no_patch_rtp, + cfg_trunk_no_patch_rtp_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no rtp-patch", NO_STR RTP_PATCH_STR) { struct mgcp_trunk *trunk = vty->index; trunk->force_constant_ssrc = 0; @@ -1136,47 +1198,52 @@ return CMD_SUCCESS; } -DEFUN(cfg_trunk_rtp_keepalive, - cfg_trunk_rtp_keepalive_cmd, - "rtp keep-alive <1-120>", - RTP_STR RTP_KEEPALIVE_STR "Keep-alive interval in secs\n") +DEFUN_USRATTR(cfg_trunk_rtp_keepalive, + cfg_trunk_rtp_keepalive_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "rtp keep-alive <1-120>", + RTP_STR RTP_KEEPALIVE_STR "Keep-alive interval in secs\n") { struct mgcp_trunk *trunk = vty->index; mgcp_trunk_set_keepalive(trunk, atoi(argv[0])); return CMD_SUCCESS; } -DEFUN(cfg_trunk_rtp_keepalive_once, - cfg_trunk_rtp_keepalive_once_cmd, - "rtp keep-alive once", - RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n") +DEFUN_USRATTR(cfg_trunk_rtp_keepalive_once, + cfg_trunk_rtp_keepalive_once_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "rtp keep-alive once", + RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n") { struct mgcp_trunk *trunk = vty->index; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_rtp_keepalive, - cfg_trunk_no_rtp_keepalive_cmd, - "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR) +DEFUN_USRATTR(cfg_trunk_no_rtp_keepalive, + cfg_trunk_no_rtp_keepalive_cmd, + X(MGW_VTY_ATTR_IMMEDIATE), + "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR) { struct mgcp_trunk *trunk = vty->index; mgcp_trunk_set_keepalive(trunk, 0); return CMD_SUCCESS; } -DEFUN(cfg_trunk_allow_transcoding, - cfg_trunk_allow_transcoding_cmd, - "allow-transcoding", "Allow transcoding\n") +DEFUN_USRATTR(cfg_trunk_allow_transcoding, + cfg_trunk_allow_transcoding_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "allow-transcoding", "Allow transcoding\n") { struct mgcp_trunk *trunk = vty->index; trunk->no_audio_transcoding = 0; return CMD_SUCCESS; } -DEFUN(cfg_trunk_no_allow_transcoding, - cfg_trunk_no_allow_transcoding_cmd, - "no allow-transcoding", NO_STR "Allow transcoding\n") +DEFUN_USRATTR(cfg_trunk_no_allow_transcoding, + cfg_trunk_no_allow_transcoding_cmd, + X(MGW_VTY_ATTR_NEW_CONN), + "no allow-transcoding", NO_STR "Allow transcoding\n") { struct mgcp_trunk *trunk = vty->index; trunk->no_audio_transcoding = 1; @@ -1185,10 +1252,11 @@ #define LINE_STR "Configure trunk for given Line\nE1/T1 Line Number\n" -DEFUN(cfg_trunk_line, - cfg_trunk_line_cmd, - "line <0-255>", - LINE_STR) +DEFUN_USRATTR(cfg_trunk_line, + cfg_trunk_line_cmd, + X(MGW_VTY_ATTR_RESTART_FULL), + "line <0-255>", + LINE_STR) { struct mgcp_trunk *trunk = vty->index; int line_nr = atoi(argv[0]); diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 37357a0..c913373 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -306,6 +306,16 @@ return -1; vty_info.copyright = osmomgw_copyright; + vty_info.usr_attr_desc[MGW_VTY_ATTR_RESTART_FULL] = \ + "This command applies on full program restart"; + vty_info.usr_attr_desc[MGW_VTY_ATTR_IMMEDIATE] = \ + "This command applies immediately"; + vty_info.usr_attr_desc[MGW_VTY_ATTR_NEW_CONN] = \ + "This command applies when a new connection is created"; + vty_info.usr_attr_letters[MGW_VTY_ATTR_RESTART_FULL] = 'F'; + vty_info.usr_attr_letters[MGW_VTY_ATTR_IMMEDIATE] = 'I'; + vty_info.usr_attr_letters[MGW_VTY_ATTR_NEW_CONN] = 'N'; + vty_init(&vty_info); logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:30:51 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 22 Sep 2020 14:30:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20250 ) Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... Patch Set 1: Still wondering if every command should also get a MGW_VTY_ATTR_RESTART_FULL... -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 14:30:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:32:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 14:32:29 +0000 Subject: Change in osmo-pcu[master]: gitignore: Add __pychache__ dir In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20242 ) Change subject: gitignore: Add __pychache__ dir ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idb67909ddd5027dbdcbf5a3882d1bb0d4ff9d29e Gerrit-Change-Number: 20242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 14:32:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:34:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 14:34:16 +0000 Subject: Change in osmo-pcu[master]: tbf: Don't log rlcmac_diag() output in separate lines In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20243 ) Change subject: tbf: Don't log rlcmac_diag() output in separate lines ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6a7d79c16c930f0712bc73b308409ececb1946ba Gerrit-Change-Number: 20243 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 14:34:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 14:34:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 14:34:30 +0000 Subject: Change in osmo-pcu[master]: gprs_ms_storage.h: Set pointer to NULL instead of 0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20244 ) Change subject: gprs_ms_storage.h: Set pointer to NULL instead of 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If8acd012909c9f452b609e4a804c9a059379f07d Gerrit-Change-Number: 20244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 14:34:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 15:02:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 15:02:09 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... vty: Add 'show bts pdch' command This allows to see which channels have been enabled according to PCU. Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 --- M src/pcu_vty.c M src/pcu_vty_functions.cpp M src/pcu_vty_functions.h 3 files changed, 39 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/20251/1 diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 99c92b7..1f89660 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -828,6 +828,15 @@ return CMD_SUCCESS; } +DEFUN(show_bts_pdch, + show_bts_pdch_cmd, + "show bts pdch", + SHOW_STR "BTS related functionality\nPDCH timeslots\n") +{ + return pcu_vty_show_bts_pdch(vty, bts_main_data()); + return CMD_SUCCESS; +} + #define IDLE_TIME_STR "keep an idle DL TBF alive for the time given\n" DEFUN_DEPRECATED(cfg_pcu_dl_tbf_idle_time, cfg_pcu_dl_tbf_idle_time_cmd, @@ -1273,6 +1282,7 @@ install_element(PCU_NODE, &cfg_pcu_timer_cmd); install_element_ve(&show_bts_stats_cmd); + install_element_ve(&show_bts_pdch_cmd); install_element_ve(&show_tbf_cmd); install_element_ve(&show_ms_all_cmd); install_element_ve(&show_ms_tlli_cmd); diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 3e9973c..efe2b1b 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -239,3 +239,31 @@ return show_ms(vty, ms); } + +int pcu_vty_show_bts_pdch(struct vty *vty, struct gprs_rlcmac_bts *bts_data) +{ + unsigned int trx_nr, ts_nr; + + vty_out(vty, "BTS (%s)%s", bts_data->active ? "active": "disabled", VTY_NEWLINE); + for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts_data->trx); trx_nr++) { + struct gprs_rlcmac_trx *trx = &bts_data->trx[trx_nr]; + + for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { + if (trx->pdch[ts_nr].is_enabled()) + break; + } + if (ts_nr == ARRAY_SIZE(trx->pdch)) + continue; /* no pdch active, skip */ + + vty_out(vty, " TRX%u%s", trx->trx_no, VTY_NEWLINE); + for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { + struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts_nr]; + + vty_out(vty, " TS%u (PDCH %s, %u UL TBFs, %u DL TBFs)%s", pdch->trx_no(), + pdch->is_enabled() ? "enabled" : "disabled", + pdch->num_tbfs(GPRS_RLCMAC_DL_TBF), + pdch->num_tbfs(GPRS_RLCMAC_UL_TBF), VTY_NEWLINE); + } + } + return CMD_SUCCESS; +} diff --git a/src/pcu_vty_functions.h b/src/pcu_vty_functions.h index 6fbc366..536637f 100644 --- a/src/pcu_vty_functions.h +++ b/src/pcu_vty_functions.h @@ -33,7 +33,7 @@ uint32_t tlli); int pcu_vty_show_ms_by_imsi(struct vty *vty, struct gprs_rlcmac_bts *bts_data, const char *imsi); - +int pcu_vty_show_bts_pdch(struct vty *vty, struct gprs_rlcmac_bts *bts_data); #ifdef __cplusplus } #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 15:09:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 15:09:57 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1//COMMIT_MSG at 11 PS1, Line 11: will ... ? I guess this paragraph should have been removed in favor of the one below? https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp at 750 PS1, Line 750: ms->dl_tbf Just wondering, is it possible that a single MS holds more than one UL and one DL TBFs? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 15:09:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 15:19:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 15:19:10 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp at 750 PS1, Line 750: ms->dl_tbf > Just wondering, is it possible that a single MS holds more than one UL and one DL TBFs? And why don't you just call ~GprsMs()? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 15:19:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 15:19:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 15:19:23 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix indentation alignment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20246 ) Change subject: cosmetic: fix indentation alignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 Gerrit-Change-Number: 20246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 15:19:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 15:26:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 15:26:31 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 1: (5 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp File src/pcu_vty_functions.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 243 PS1, Line 243: struct const? https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 247 PS1, Line 247: ": missing space https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 249 PS1, Line 249: struct const? https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 251 PS1, Line 251: for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { You can store pdch_mask from INFO.ind, and simply use it here to check of a TRX has active PDCH slots. https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 260 PS1, Line 260: struct const? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 15:26:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 16:04:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 16:04:03 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix indentation of for loops References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20252 ) Change subject: cosmetic: Fix indentation of for loops ...................................................................... cosmetic: Fix indentation of for loops Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 48 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/52/20252/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index c4fbbad..836dab5 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -562,70 +562,70 @@ mslot_fill_rx_mask(mslot_class, num_tx, rx_mask); - /* Rotate group of TX slots: UUU-----, -UUU----, ..., UU-----U */ - for (ul_ts = 0; ul_ts < 8; ul_ts += 1, tx_valid_win <<= 1) { - uint16_t rx_valid_win; - uint32_t checked_rx[256/32] = {0}; + /* Rotate group of TX slots: UUU-----, -UUU----, ..., UU-----U */ + for (ul_ts = 0; ul_ts < 8; ul_ts += 1, tx_valid_win <<= 1) { + uint16_t rx_valid_win; + uint32_t checked_rx[256/32] = {0}; - /* Wrap valid window */ - tx_valid_win = mslot_wrap_window(tx_valid_win); + /* Wrap valid window */ + tx_valid_win = mslot_wrap_window(tx_valid_win); - tx_window = tx_valid_win; + tx_window = tx_valid_win; - /* Filter out unavailable slots */ - tx_window &= *ul_slots; + /* Filter out unavailable slots */ + tx_window &= *ul_slots; - /* Skip if the the first TS (ul_ts) is not in the set */ - if ((tx_window & (1 << ul_ts)) == 0) - continue; + /* Skip if the the first TS (ul_ts) is not in the set */ + if ((tx_window & (1 << ul_ts)) == 0) + continue; - /* Skip if the the last TS (ul_ts+num_tx-1) is not in the set */ - if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0) - continue; + /* Skip if the the last TS (ul_ts+num_tx-1) is not in the set */ + if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0) + continue; - rx_valid_win = (1 << OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx)) - 1; + rx_valid_win = (1 << OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx)) - 1; - /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */ - for (dl_ts = 0; dl_ts < 8; dl_ts += 1, rx_valid_win <<= 1) { - /* Wrap valid window */ - rx_valid_win = (rx_valid_win | rx_valid_win >> 8) & 0xff; + /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */ + for (dl_ts = 0; dl_ts < 8; dl_ts += 1, rx_valid_win <<= 1) { + /* Wrap valid window */ + rx_valid_win = (rx_valid_win | rx_valid_win >> 8) & 0xff; - /* Validate with both Tta/Ttb/Trb and Ttb/Tra/Trb */ - for (mask_sel = MASK_TT; mask_sel <= MASK_TR; mask_sel += 1) { - int capacity; + /* Validate with both Tta/Ttb/Trb and Ttb/Tra/Trb */ + for (mask_sel = MASK_TT; mask_sel <= MASK_TR; mask_sel += 1) { + int capacity; - rx_window = mslot_filter_bad(rx_mask[mask_sel], ul_ts, *dl_slots, rx_valid_win); - if (rx_window < 0) - continue; + rx_window = mslot_filter_bad(rx_mask[mask_sel], ul_ts, *dl_slots, rx_valid_win); + if (rx_window < 0) + continue; - if (skip_slot(mslot_class, mask_sel != MASK_TT, rx_window, tx_window, checked_rx)) - continue; + if (skip_slot(mslot_class, mask_sel != MASK_TT, rx_window, tx_window, checked_rx)) + continue; - /* Compute capacity */ - capacity = compute_capacity(trx, rx_window, tx_window); + /* Compute capacity */ + capacity = compute_capacity(trx, rx_window, tx_window); #ifdef ENABLE_TS_ALLOC_DEBUG - LOGP(DRLCMAC, LOGL_DEBUG, - "- Considering DL/UL slots: (TS=0)\"%s\"(TS=7), " - "capacity = %d\n", - set_flag_chars(set_flag_chars(set_flag_chars(set_flag_chars( - slot_info, - rx_bad, 'x', '.'), - rx_window, 'D'), - tx_window, 'U'), - rx_window & tx_window, 'C'), - capacity); + LOGP(DRLCMAC, LOGL_DEBUG, + "- Considering DL/UL slots: (TS=0)\"%s\"(TS=7), " + "capacity = %d\n", + set_flag_chars(set_flag_chars(set_flag_chars(set_flag_chars( + slot_info, + rx_bad, 'x', '.'), + rx_window, 'D'), + tx_window, 'U'), + rx_window & tx_window, 'C'), + capacity); #endif - if (capacity <= max_capacity) - continue; + if (capacity <= max_capacity) + continue; - max_capacity = capacity; - max_ul_slots = tx_window; - max_dl_slots = rx_window; - } - } - } + max_capacity = capacity; + max_ul_slots = tx_window; + max_dl_slots = rx_window; + } + } + } } if (!max_ul_slots || !max_dl_slots) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777 Gerrit-Change-Number: 20252 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 16:06:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 16:06:41 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 1: Code-Review-1 self note: I just noticed something is wrong and it's always printing TS0 for all TS. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 16:06:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 16:06:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 16:06:49 +0000 Subject: Change in osmo-pcu[master]: gitignore: Add __pychache__ dir In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20242 ) Change subject: gitignore: Add __pychache__ dir ...................................................................... gitignore: Add __pychache__ dir That's created by VTY tests running python. Change-Id: Idb67909ddd5027dbdcbf5a3882d1bb0d4ff9d29e --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 58be63b..01f4f47 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ # tests .dirstamp +__pycache__/ tests/atconfig tests/package.m4 tests/*/*Test -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idb67909ddd5027dbdcbf5a3882d1bb0d4ff9d29e Gerrit-Change-Number: 20242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 16:09:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 16:09:33 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp at 750 PS1, Line 750: ms->dl_tbf > And why don't you just call ~GprsMs()? Because that's not how deallocation works in PDCH. Lifecycle is really complex (too much imho). The deallocation of ms object is meant to be done through unreferencing, and never directly, but through dropping TBFs. I spent quite a lot of time finding the correct way to do this and test it to getting it done right and spotting no crash afterwards. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 16:09:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 16:10:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 16:10:14 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1/src/pcu_l1_if.cpp at 750 PS1, Line 750: ms->dl_tbf > Because that's not how deallocation works in PDCH. Lifecycle is really complex (too much imho). [?] No, MS only holds one DL TBF and one UL TBF as per current implementation. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 16:10:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 16:10:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 16:10:44 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/20245/1//COMMIT_MSG at 11 PS1, Line 11: will > ... ? [?] Indeed, sorry for that, I rephrased below and forgot to drop this one. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 16:10:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:23:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:23:38 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20253 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I6567065b8ec0082b21c371bbd0c2e85fecc96c90 --- M src/tbf.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/53/20253/1 diff --git a/src/tbf.h b/src/tbf.h index 99aba67..936ff65 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -275,8 +275,8 @@ enum gprs_rlcmac_tbf_direction direction; struct gprs_rlcmac_trx *trx; uint8_t first_ts; /* first TS used by TBF */ - uint8_t first_common_ts; /* first TS that the phone can send and - reveive simultaniously */ + uint8_t first_common_ts; /* first TS where the phone can send and + receive simultaniously */ uint8_t control_ts; /* timeslot control messages and polling */ struct gprs_rlcmac_pdch *pdch[8]; /* list of PDCHs allocated to TBF */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6567065b8ec0082b21c371bbd0c2e85fecc96c90 Gerrit-Change-Number: 20253 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:23:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:23:39 +0000 Subject: Change in osmo-pcu[master]: Fix crash accessing NULL tbf->pdch[first_ts] References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20254 ) Change subject: Fix crash accessing NULL tbf->pdch[first_ts] ...................................................................... Fix crash accessing NULL tbf->pdch[first_ts] Fixes consistent crash under some specific scenarios explained in OS#4756. The crash was caused due to a bug in channel allocator algorithm incorrectly populating tbf->pdch[] array as a result of mismatching first_ts and resulting pdch selected slot bitmask. The issue happens because when allocating a UL TBF in allocator B, the subset is always further forced into allocating one single TS. As a result, on that branch several variables are updated, but first_ts was not. The field used to be updated in older versions, but a bug was introduced during code refactoring in commit listed below (31 Jan 2018). Fixes: 0cc7212cfdfd40e87b531ecf14e76356185f4036 Related: OS#4756 Change-Id: I79596803f7dab6f21b58bfe39c2af65d9c5b39d5 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/54/20254/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 836dab5..496d19b 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -896,8 +896,6 @@ if (rc < 0) return -EINVAL; - first_ts = ffs(rc) - 1; - /* Step 3b: Derive the slot set for a given direction */ if (tbf->direction == GPRS_RLCMAC_DL_TBF) { dl_slots = rc; @@ -914,6 +912,7 @@ update_slot_counters(ul_slots, reserved_ul_slots, &slotcount, &avail_count); } + first_ts = ffs(rc) - 1; first_common_ts = ffs(dl_slots & ul_slots) - 1; if (first_common_ts < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I79596803f7dab6f21b58bfe39c2af65d9c5b39d5 Gerrit-Change-Number: 20254 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:39:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:39:46 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: remove remains of loopback functionality In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20247 ) Change subject: mgcp_vty: remove remains of loopback functionality ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1 Gerrit-Change-Number: 20247 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:39:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:42:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:42:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: remove remains of loopback functionality In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20247 ) Change subject: mgcp_vty: remove remains of loopback functionality ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1 Gerrit-Change-Number: 20247 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 18:42:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:43:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:43:13 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: deprecate bind early command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20248 ) Change subject: mgcp_vty: deprecate bind early command ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 Gerrit-Change-Number: 20248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 18:43:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:43:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:43:54 +0000 Subject: Change in osmo-mgw[master]: mgcp_e1: do not expose function mgcp_e1_init() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20249 ) Change subject: mgcp_e1: do not expose function mgcp_e1_init() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6aba1c55c9b1d729709ee1fba2994c77bd848a9b Gerrit-Change-Number: 20249 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 18:43:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:46:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:46:20 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: deprecate bind early command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20248 ) Change subject: mgcp_vty: deprecate bind early command ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/20248/1/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/20248/1/src/libosmo-mgcp/mgcp_vty.c at 451 PS1, Line 451: CMD_WARNING Shouldn't we return CMD_SUCCESS instead? CMD_WARNING would trigger a configuration parsing error, AFAIR. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 Gerrit-Change-Number: 20248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 18:46:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:49:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:49:58 +0000 Subject: Change in osmo-pcu[master]: Fix crash accessing NULL tbf->pdch[first_ts] In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20254 ) Change subject: Fix crash accessing NULL tbf->pdch[first_ts] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I79596803f7dab6f21b58bfe39c2af65d9c5b39d5 Gerrit-Change-Number: 20254 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:49:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:50:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:50:18 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20253 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6567065b8ec0082b21c371bbd0c2e85fecc96c90 Gerrit-Change-Number: 20253 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:50:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:51:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:51:28 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp File src/pcu_vty_functions.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 251 PS1, Line 251: for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { > You can store pdch_mask from INFO. [?] We do this kind of iteration in lots of places already. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:51:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:52:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:52:58 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: Hello lynxis lazus, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 to look at the new patch set (#2). Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Free all MS TBFs when receiving GPRS Suspension Request Otherwise the TBFs are kept, and hence PCU will continue reserving resources and DL data queued will still be sent over the air, despite the MS not listening anymore on the PDCH. Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 --- M src/pcu_l1_if.cpp 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/45/20245/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:52:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:52:58 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix indentation alignment In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20246 to look at the new patch set (#2). Change subject: cosmetic: fix indentation alignment ...................................................................... cosmetic: fix indentation alignment Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 --- M src/pcu_vty_functions.cpp 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/20246/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 Gerrit-Change-Number: 20246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:52:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:52:58 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 to look at the new patch set (#2). Change subject: vty: Add 'show bts pdch' command ...................................................................... vty: Add 'show bts pdch' command This allows to see which channels have been enabled according to PCU. Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 --- M src/pcu_vty.c M src/pcu_vty_functions.cpp M src/pcu_vty_functions.h 3 files changed, 39 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/20251/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:53:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:53:36 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp File src/pcu_vty_functions.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 251 PS1, Line 251: for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { > We do this kind of iteration in lots of places already. So then it's a nice chance to optimize it out everywhere, or at least here ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:53:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:54:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:54:43 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20251/2/src/pcu_vty.c File src/pcu_vty.c: https://gerrit.osmocom.org/c/osmo-pcu/+/20251/2/src/pcu_vty.c at 837 PS2, Line 837: return double return -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:54:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:56:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:56:15 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix indentation of for loops In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20252 ) Change subject: cosmetic: Fix indentation of for loops ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777 Gerrit-Change-Number: 20252 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:56:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:56:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:56:58 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 18:56:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:57:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:57:01 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 to look at the new patch set (#3). Change subject: vty: Add 'show bts pdch' command ...................................................................... vty: Add 'show bts pdch' command This allows to see which channels have been enabled according to PCU. Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 --- M src/pcu_vty.c M src/pcu_vty_functions.cpp M src/pcu_vty_functions.h 3 files changed, 38 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/20251/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:57:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 18:57:56 +0000 Subject: Change in osmo-mgw[master]: mgcp_e1: do not expose function mgcp_e1_init() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20249 ) Change subject: mgcp_e1: do not expose function mgcp_e1_init() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6aba1c55c9b1d729709ee1fba2994c77bd848a9b Gerrit-Change-Number: 20249 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 18:57:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 18:59:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 22 Sep 2020 18:59:04 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp File src/pcu_vty_functions.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20251/1/src/pcu_vty_functions.cpp at 251 PS1, Line 251: for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { > So then it's a nice chance to optimize it out everywhere, or at least here ;) 1- It's a VTY command to be called seldomly manually, I don't care about iterating a few TS. 2- I don't feel like adding another field to the general code structure just for optimizing this VTY loop. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 18:59:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:06:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:06:20 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20250 ) Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:06:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:06:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:06:35 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: remove remains of loopback functionality In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20247 ) Change subject: mgcp_vty: remove remains of loopback functionality ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1 Gerrit-Change-Number: 20247 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:06:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:07:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:07:52 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: deprecate bind early command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20248 ) Change subject: mgcp_vty: deprecate bind early command ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/20248/1/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/20248/1/src/libosmo-mgcp/mgcp_vty.c at 451 PS1, Line 451: CMD_WARNING > Shouldn't we return CMD_SUCCESS instead? CMD_WARNING would trigger a configuration parsing error, AF [?] CMD_ERROR ends config file parsing, but CMD_WARNING shouldn't, AFAIR. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 Gerrit-Change-Number: 20248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:07:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:08:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:08:04 +0000 Subject: Change in osmo-mgw[master]: mgcp_e1: do not expose function mgcp_e1_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20249 ) Change subject: mgcp_e1: do not expose function mgcp_e1_init() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6aba1c55c9b1d729709ee1fba2994c77bd848a9b Gerrit-Change-Number: 20249 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:08:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:19:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:19:28 +0000 Subject: Change in osmo-pcu[master]: tbf: Don't log rlcmac_diag() output in separate lines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20243 ) Change subject: tbf: Don't log rlcmac_diag() output in separate lines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6a7d79c16c930f0712bc73b308409ececb1946ba Gerrit-Change-Number: 20243 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:19:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:19:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:19:41 +0000 Subject: Change in osmo-pcu[master]: gprs_ms_storage.h: Set pointer to NULL instead of 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20244 ) Change subject: gprs_ms_storage.h: Set pointer to NULL instead of 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If8acd012909c9f452b609e4a804c9a059379f07d Gerrit-Change-Number: 20244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:19:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:21:10 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:21:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:21:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:21:24 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix indentation alignment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20246 ) Change subject: cosmetic: fix indentation alignment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 Gerrit-Change-Number: 20246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:21:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:21:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:21:51 +0000 Subject: Change in osmo-pcu[master]: tbf: Don't log rlcmac_diag() output in separate lines In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20243 ) Change subject: tbf: Don't log rlcmac_diag() output in separate lines ...................................................................... tbf: Don't log rlcmac_diag() output in separate lines Output of all diag in different lines is really confusing, since the user reads a timeout ocurred and then later in another line something like "Downlink ACK was received" while no GSMTAP message shows any ACK. Change-Id: I6a7d79c16c930f0712bc73b308409ececb1946ba --- M src/tbf.cpp M src/tbf.h M tests/tbf/TbfTest.err 3 files changed, 31 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 0447edc..9545511 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -20,6 +20,7 @@ */ #include +#include #include #include @@ -647,8 +648,13 @@ LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF\n", get_value_string(tbf_timers_names, t)); - if (run_diag) - tbf->rlcmac_diag(); + if (run_diag) { + LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF: %s\n", + get_value_string(tbf_timers_names, t), tbf->rlcmac_diag().c_str()); + } else { + LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF\n", + get_value_string(tbf_timers_names, t)); + } tbf_free(tbf); } @@ -816,8 +822,9 @@ if (ul_tbf && ul_tbf->handle_ctrl_ack()) { if (!ul_tbf->ctrl_ack_to_toggle()) { - LOGPTBF(this, LOGL_NOTICE, "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ACK\n"); - rlcmac_diag(); + LOGPTBF(this, LOGL_NOTICE, + "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ACK: %s\n", + rlcmac_diag().c_str()); } bts->do_rate_ctr_inc(CTR_RLC_ACK_TIMEDOUT); bts->do_rate_ctr_inc(CTR_PUAN_POLL_TIMEDOUT); @@ -835,8 +842,8 @@ } else if (ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) { if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS))) { LOGPTBF(this, LOGL_NOTICE, - "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT.\n"); - rlcmac_diag(); + "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: %s\n", + rlcmac_diag().c_str()); state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS); } ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE; @@ -854,8 +861,8 @@ } else if (dl_ass_state == GPRS_RLCMAC_DL_ASS_WAIT_ACK) { if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS))) { LOGPTBF(this, LOGL_NOTICE, - "Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT.\n"); - rlcmac_diag(); + "Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: %s\n", + rlcmac_diag().c_str()); state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS); } dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE; @@ -875,8 +882,8 @@ if (!(dl_tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) { LOGPTBF(this, LOGL_NOTICE, - "Timeout for polling PACKET DOWNLINK ACK.\n"); - dl_tbf->rlcmac_diag(); + "Timeout for polling PACKET DOWNLINK ACK: %s\n", + dl_tbf->rlcmac_diag().c_str()); dl_tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK); } @@ -1169,22 +1176,24 @@ } } -int gprs_rlcmac_tbf::rlcmac_diag() +std::string gprs_rlcmac_tbf::rlcmac_diag() { + std::ostringstream os; + os << "|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))) - LOGPTBF(this, LOGL_NOTICE, "Assignment was on CCCH\n"); + os << "Assignment was on CCCH|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))) - LOGPTBF(this, LOGL_NOTICE, "Assignment was on PACCH\n"); + os << "Assignment was on PACCH|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA))) - LOGPTBF(this, LOGL_NOTICE, "Uplink data was received\n"); + os << "Uplink data was received|"; else if (direction == GPRS_RLCMAC_UL_TBF) - LOGPTBF(this, LOGL_NOTICE, "No uplink data received yet\n"); + os << "No uplink data received yet|"; if ((state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))) - LOGPTBF(this, LOGL_NOTICE, "Downlink ACK was received\n"); + os << "Downlink ACK was received|"; else if (direction == GPRS_RLCMAC_DL_TBF) - LOGPTBF(this, LOGL_NOTICE, "No downlink ACK received yet\n"); + os << "No downlink ACK received yet|"; - return 0; + return os.str(); } struct msgb *gprs_rlcmac_tbf::create_dl_ass(uint32_t fn, uint8_t ts) diff --git a/src/tbf.h b/src/tbf.h index 528bee3..99aba67 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -20,6 +20,8 @@ #ifdef __cplusplus +#include + #include "llc.h" #include "rlc.h" #include "cxx_linuxlist.h" @@ -212,7 +214,7 @@ uint8_t tsc() const; - int rlcmac_diag(); + std::string rlcmac_diag(); bool n_inc(enum tbf_counters n); void n_reset(enum tbf_counters n); diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 681e7a3..ce23802 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1725,9 +1725,7 @@ Searching for first unallocated TFI: TRX=0 Found TFI=1. TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654292, TS=7 (curr FN 2654335) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK. -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Assignment was on PACCH -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) No downlink ACK received yet +TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6a7d79c16c930f0712bc73b308409ececb1946ba Gerrit-Change-Number: 20243 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:21:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:21:52 +0000 Subject: Change in osmo-pcu[master]: gprs_ms_storage.h: Set pointer to NULL instead of 0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20244 ) Change subject: gprs_ms_storage.h: Set pointer to NULL instead of 0 ...................................................................... gprs_ms_storage.h: Set pointer to NULL instead of 0 Change-Id: If8acd012909c9f452b609e4a804c9a059379f07d --- M src/gprs_ms_storage.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/gprs_ms_storage.h b/src/gprs_ms_storage.h index 14707f5..abd9eaa 100644 --- a/src/gprs_ms_storage.h +++ b/src/gprs_ms_storage.h @@ -38,7 +38,7 @@ virtual void ms_idle(class GprsMs *); virtual void ms_active(class GprsMs *); - GprsMs *get_ms(uint32_t tlli, uint32_t old_tlli = 0, const char *imsi = 0) const; + GprsMs *get_ms(uint32_t tlli, uint32_t old_tlli = 0, const char *imsi = NULL) const; GprsMs *create_ms(); const LListHead& ms_list() const {return m_list;} -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If8acd012909c9f452b609e4a804c9a059379f07d Gerrit-Change-Number: 20244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:21:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:21:53 +0000 Subject: Change in osmo-pcu[master]: Free all MS TBFs when receiving GPRS Suspension Request In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20245 ) Change subject: Free all MS TBFs when receiving GPRS Suspension Request ...................................................................... Free all MS TBFs when receiving GPRS Suspension Request Otherwise the TBFs are kept, and hence PCU will continue reserving resources and DL data queued will still be sent over the air, despite the MS not listening anymore on the PDCH. Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 --- M src/pcu_l1_if.cpp 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 21eacfd..535fb70 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -49,6 +49,8 @@ #include #include #include +#include +#include // FIXME: move this, when changed from c++ to c. extern "C" { @@ -730,7 +732,11 @@ static int pcu_rx_susp_req(struct gsm_pcu_if_susp_req *susp_req) { + BTS *bts = BTS::main_bts(); struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx(); + GprsMs *ms; + struct gprs_rlcmac_dl_tbf *dl_tbf; + struct gprs_rlcmac_ul_tbf *ul_tbf; struct gprs_ra_id ra_id; gsm48_parse_ra(&ra_id, susp_req->ra_id); @@ -738,6 +744,17 @@ LOGP(DL1IF, LOGL_INFO, "GPRS Suspend request received: TLLI=0x%08x RAI=%s\n", susp_req->tlli, osmo_rai_name(&ra_id)); + if ((ms = bts->ms_store().get_ms(susp_req->tlli))) { + /* We need to catch both pointers here since MS may become freed + after first tbf_free(dl_tbf) if only DL TBF was available */ + dl_tbf = ms->dl_tbf(); + ul_tbf = ms->ul_tbf(); + if (dl_tbf) + tbf_free(dl_tbf); + if (ul_tbf) + tbf_free(ul_tbf); + } + if (!bctx) return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4ae1c3706b2ed6e4d271cd16f7cd7f8937b84836 Gerrit-Change-Number: 20245 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:21:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:21:53 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix indentation alignment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20246 ) Change subject: cosmetic: fix indentation alignment ...................................................................... cosmetic: fix indentation alignment Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 --- M src/pcu_vty_functions.cpp 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 97241e1..3e9973c 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -50,19 +50,19 @@ gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) TA=%u DIR=%s IMSI=%s%s", tbf->tfi(), - tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid", - tbf->ta(), - tbf->direction == GPRS_RLCMAC_UL_TBF ? "UL" : "DL", - tbf->imsi(), VTY_NEWLINE); + tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid", + tbf->ta(), + tbf->direction == GPRS_RLCMAC_UL_TBF ? "UL" : "DL", + tbf->imsi(), VTY_NEWLINE); vty_out(vty, " created=%lu state=%08x [CCCH:%u, PACCH:%u] 1st_TS=%d 1st_cTS=%d ctrl_TS=%d MS_CLASS=%d/%d%s", tbf->created_ts(), tbf->state_flags, tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH), tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH), tbf->first_ts, - tbf->first_common_ts, tbf->control_ts, - tbf->ms_class(), - tbf->ms() ? tbf->ms()->egprs_ms_class() : -1, - VTY_NEWLINE); + tbf->first_common_ts, tbf->control_ts, + tbf->ms_class(), + tbf->ms() ? tbf->ms()->egprs_ms_class() : -1, + VTY_NEWLINE); vty_out(vty, " TS_alloc="); for (int i = 0; i < 8; i++) { bool is_ctrl = tbf->is_control_ts(i); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105cf184a478cf178d69e16cd35fa36c51133a18 Gerrit-Change-Number: 20246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:22:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:22:20 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix indentation of for loops In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20252 ) Change subject: cosmetic: Fix indentation of for loops ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777 Gerrit-Change-Number: 20252 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:22:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:22:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:22:32 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20253 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6567065b8ec0082b21c371bbd0c2e85fecc96c90 Gerrit-Change-Number: 20253 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:22:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:23:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:23:23 +0000 Subject: Change in osmo-pcu[master]: Fix crash accessing NULL tbf->pdch[first_ts] In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20254 ) Change subject: Fix crash accessing NULL tbf->pdch[first_ts] ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I79596803f7dab6f21b58bfe39c2af65d9c5b39d5 Gerrit-Change-Number: 20254 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:23:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:24:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:24:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Check attempted/successful channel requests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 ) Change subject: bsc: Check attempted/successful channel requests ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Gerrit-Change-Number: 20225 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:24:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:26:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:26:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 3: > Patch Set 3: > > This is an ongoing discussion in lots of places where AFAIU fixeria wants to test only one and one only thing on each test while other people prefer testing all possibles parts are working fine on each scenario. I'm of the opinion we should do the later. I'm clearly with fixeria here. A test should generally try to focus on testing one thing. Sure, you always have underlying protocols and state that you need to reach, but weshould avoid testing tons of unrelated stuff. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:26:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:27:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:27:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 3: Code-Review+1 > I'm clearly with fixeria here. A test should generally try to focus on testing one thing. Sure, you always have underlying protocols and state that you need to reach, but weshould avoid testing tons of unrelated stuff. having stated that, I think counters are slightly different, as they are mostly a by-product of some other action/procedure, rather than one by themselves. So I think it's ok to do "drive-by counter checking". -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:27:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:27:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:27:50 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Avoid calling memcpy with size=0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20230 ) Change subject: osmo_strlcpy: Avoid calling memcpy with size=0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic84af86d33c8a20f06036b13d0a10cf312582f0d Gerrit-Change-Number: 20230 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:27:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:28:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:28:11 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Clarify length calculation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20231 ) Change subject: osmo_strlcpy: Clarify length calculation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 Gerrit-Change-Number: 20231 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 22 Sep 2020 19:28:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:28:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:28:14 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Avoid calling memcpy with size=0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20230 ) Change subject: osmo_strlcpy: Avoid calling memcpy with size=0 ...................................................................... osmo_strlcpy: Avoid calling memcpy with size=0 Change-Id: Ic84af86d33c8a20f06036b13d0a10cf312582f0d --- M src/utils.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/utils.c b/src/utils.c index 3c4a8c9..168f85f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -545,7 +545,7 @@ /*! Generic big-endian encoding of big endian number up to 64bit * \param[in] value unsigned integer value to be stored - * \param[in] data_len number of octets + * \param[in] data_len number of octets * \returns static buffer containing big-endian stored value * * This is like osmo_store64be_ext, except that this returns a static buffer of @@ -577,7 +577,7 @@ if (siz) { size_t len = (ret >= siz) ? siz - 1 : ret; - if (src) + if (len) memcpy(dst, src, len); dst[len] = '\0'; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic84af86d33c8a20f06036b13d0a10cf312582f0d Gerrit-Change-Number: 20230 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:28:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:28:15 +0000 Subject: Change in libosmocore[master]: osmo_strlcpy: Clarify length calculation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20231 ) Change subject: osmo_strlcpy: Clarify length calculation ...................................................................... osmo_strlcpy: Clarify length calculation Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 --- M src/utils.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/utils.c b/src/utils.c index 168f85f..772b671 100644 --- a/src/utils.c +++ b/src/utils.c @@ -576,7 +576,7 @@ size_t ret = src ? strlen(src) : 0; if (siz) { - size_t len = (ret >= siz) ? siz - 1 : ret; + size_t len = OSMO_MIN(siz - 1, ret); if (len) memcpy(dst, src, len); dst[len] = '\0'; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8 Gerrit-Change-Number: 20231 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:28:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:28:36 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: drop redundant 'break' statements In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20235 ) Change subject: vty: cosmetic: drop redundant 'break' statements ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I54ee7c3c6fe16a413d0e1128c7358ff6e4b76c6a Gerrit-Change-Number: 20235 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:28:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:29:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:29:11 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20236 ) Change subject: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5 Gerrit-Change-Number: 20236 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:29:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:29:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:29:26 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: fix missing curly braces in vty_describe_command() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20237 ) Change subject: vty: cosmetic: fix missing curly braces in vty_describe_command() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1585ee70a3db77aa8737f9463c4d0665f4e90d90 Gerrit-Change-Number: 20237 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:29:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:29:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:29:28 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: drop redundant 'break' statements In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20235 ) Change subject: vty: cosmetic: drop redundant 'break' statements ...................................................................... vty: cosmetic: drop redundant 'break' statements Change-Id: I54ee7c3c6fe16a413d0e1128c7358ff6e4b76c6a --- M src/vty/vty.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/vty.c b/src/vty/vty.c index ebdf9fc..e335f3a 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1143,14 +1143,12 @@ vty_prompt(vty); vty_redraw_line(vty); return; - break; case CMD_ERR_NO_MATCH: cmd_free_strvec(vline); vty_out(vty, "%% There is no matched command.%s", VTY_NEWLINE); vty_prompt(vty); vty_redraw_line(vty); return; - break; } /* Get width of command string. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I54ee7c3c6fe16a413d0e1128c7358ff6e4b76c6a Gerrit-Change-Number: 20235 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:29:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:29:28 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20236 ) Change subject: vty: cosmetic: s/width/cmd_width/g in vty_describe_command() ...................................................................... vty: cosmetic: s/width/cmd_width/g in vty_describe_command() Change-Id: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5 --- M src/vty/vty.c 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/vty.c b/src/vty/vty.c index e335f3a..2b131a4 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1119,7 +1119,7 @@ int ret; vector vline; vector describe; - unsigned int i, width, desc_width; + unsigned int i, cmd_width, desc_width; struct desc *desc, *desc_cr = NULL; vline = cmd_make_strvec(vty->buf); @@ -1152,7 +1152,7 @@ } /* Get width of command string. */ - width = 0; + cmd_width = 0; for (i = 0; i < vector_active(describe); i++) if ((desc = vector_slot(describe, i)) != NULL) { unsigned int len; @@ -1164,12 +1164,12 @@ if (desc->cmd[0] == '.') len--; - if (width < len) - width = len; + if (cmd_width < len) + cmd_width = len; } /* Get width of description string. */ - desc_width = vty->width - (width + 6); + desc_width = vty->width - (cmd_width + 6); /* Print out description. */ for (i = 0; i < vector_active(describe); i++) @@ -1188,15 +1188,15 @@ '.' ? desc->cmd + 1 : desc->cmd, VTY_NEWLINE); else if (desc_width >= strlen(desc->str)) - vty_out(vty, " %-*s %s%s", width, + vty_out(vty, " %-*s %s%s", cmd_width, desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, desc->str, VTY_NEWLINE); else - vty_describe_fold(vty, width, desc_width, desc); + vty_describe_fold(vty, cmd_width, desc_width, desc); #if 0 - vty_out(vty, " %-*s %s%s", width + vty_out(vty, " %-*s %s%s", cmd_width desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, desc->str ? desc->str : "", VTY_NEWLINE); #endif /* 0 */ @@ -1208,11 +1208,11 @@ desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, VTY_NEWLINE); else if (desc_width >= strlen(desc->str)) - vty_out(vty, " %-*s %s%s", width, + vty_out(vty, " %-*s %s%s", cmd_width, desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd, desc->str, VTY_NEWLINE); else - vty_describe_fold(vty, width, desc_width, desc); + vty_describe_fold(vty, cmd_width, desc_width, desc); } cmd_free_strvec(vline); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifcf5f7be925c5421040d3cac2c4c5e4dd497c0f5 Gerrit-Change-Number: 20236 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:29:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:29:29 +0000 Subject: Change in libosmocore[master]: vty: cosmetic: fix missing curly braces in vty_describe_command() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20237 ) Change subject: vty: cosmetic: fix missing curly braces in vty_describe_command() ...................................................................... vty: cosmetic: fix missing curly braces in vty_describe_command() Change-Id: I1585ee70a3db77aa8737f9463c4d0665f4e90d90 --- M src/vty/vty.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/vty.c b/src/vty/vty.c index 2b131a4..6e7bdcb 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1153,7 +1153,7 @@ /* Get width of command string. */ cmd_width = 0; - for (i = 0; i < vector_active(describe); i++) + for (i = 0; i < vector_active(describe); i++) { if ((desc = vector_slot(describe, i)) != NULL) { unsigned int len; @@ -1167,12 +1167,13 @@ if (cmd_width < len) cmd_width = len; } + } /* Get width of description string. */ desc_width = vty->width - (cmd_width + 6); /* Print out description. */ - for (i = 0; i < vector_active(describe); i++) + for (i = 0; i < vector_active(describe); i++) { if ((desc = vector_slot(describe, i)) != NULL) { if (desc->cmd[0] == '\0') continue; @@ -1201,6 +1202,7 @@ desc->str ? desc->str : "", VTY_NEWLINE); #endif /* 0 */ } + } if ((desc = desc_cr)) { if (!desc->str) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1585ee70a3db77aa8737f9463c4d0665f4e90d90 Gerrit-Change-Number: 20237 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:31:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:31:32 +0000 Subject: Change in osmo-e1d[master]: make sure a given timeslot can only be opened once (by default) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20081 ) Change subject: make sure a given timeslot can only be opened once (by default) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 Gerrit-Change-Number: 20081 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 22 Sep 2020 19:31:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:31:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:31:35 +0000 Subject: Change in osmo-e1d[master]: make sure a given timeslot can only be opened once (by default) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/20081 ) Change subject: make sure a given timeslot can only be opened once (by default) ...................................................................... make sure a given timeslot can only be opened once (by default) Align the behavior of osmo-e1d with that of DAHDI: If a timeslot is opened once, it cannot be opened again by anyone until it is closed by the current owner. This way we'd have the same failure semantics in DAHDI vs. osmo-e1d, which is very useful in case of misconfiguration when osmo-bsc + osmo-mgw would "fight" over a timeslot. Add a osmo_e1dp_client_ts_open_force() function that allows to override and get back the original behavior. Closes: OS#4654 Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 --- A TODO-RELEASE M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto_clnt.c 5 files changed, 37 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..27e2d93 --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1 @@ +* bump protocol version as 'flags' member was added to osmo_d1dp_ts_config diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 5628e31..6457f14 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -81,6 +81,8 @@ E1DP_TSMODE_HDLCFCS = 0x11, }; +/* osmo_e1dp_ts_config.flags */ +#define E1DP_TS_OPEN_F_FORCE 0x80 /* the idea here is to use the first byte as a version number, to prevent incompatible * clients from connecting to e1d */ @@ -118,6 +120,7 @@ struct osmo_e1dp_ts_config { uint8_t mode; + uint8_t flags; uint16_t read_bufsize; } __attribute__((packed)); diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index 5a4f965..1473716 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -46,3 +46,6 @@ int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize); +int osmo_e1dp_client_ts_open_force(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, uint8_t ts, + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize); diff --git a/src/ctl.c b/src/ctl.c index 8da21fd..8a0e339 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -395,8 +395,16 @@ return 0; } - /* If already open, close previous */ - e1_ts_stop(ts); + if (ts->fd >= 0) { + /* we only force-reopen a busy timeslot if the flag is set */ + if (cfg->flags & E1DP_TS_OPEN_F_FORCE) { + e1_ts_stop(ts); + } else { + LOGPTS(ts, DE1D, LOGL_ERROR, + "Timeslot already open, rejecting re-open without F_FORCE\n"); + return 0; + } + } /* Init */ ret = _e1d_ts_start(ts, mode, cfg->read_bufsize); diff --git a/src/proto_clnt.c b/src/proto_clnt.c index 69c7234..0f6e367 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -315,10 +315,10 @@ return 0; } -int -osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, +static int +_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, - enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize, uint8_t flags) { struct msgb *msgb; struct osmo_e1dp_msg_hdr hdr; @@ -333,6 +333,7 @@ memset(&cfg, 0x00, sizeof(struct osmo_e1dp_ts_config)); cfg.mode = mode; + cfg.flags = flags; cfg.read_bufsize = read_bufsize; tsfd = -1; @@ -348,3 +349,19 @@ return tsfd; } + +int +osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, uint8_t ts, + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) +{ + return _client_ts_open(clnt, intf, line, ts, mode, read_bufsize, 0); +} + +int +osmo_e1dp_client_ts_open_force(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, uint8_t ts, + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) +{ + return _client_ts_open(clnt, intf, line, ts, mode, read_bufsize, E1DP_TS_OPEN_F_FORCE); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/20081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 Gerrit-Change-Number: 20081 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:32:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:32:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmo_ign In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 ) Change subject: mgw: Introduce test TC_crcx_osmo_ign ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79415c385e89fe859854430bb20940f078fccea0 Gerrit-Change-Number: 20219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:32:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:32:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:32:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmo_ign In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 ) Change subject: mgw: Introduce test TC_crcx_osmo_ign ...................................................................... mgw: Introduce test TC_crcx_osmo_ign Related: SYS#5063 Change-Id: I79415c385e89fe859854430bb20940f078fccea0 --- M library/MGCP_Templates.ttcn M library/MGCP_Types.ttcn M mgw/MGCP_Test.ttcn 3 files changed, 38 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index 79d9670..917ef89 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -55,6 +55,12 @@ val := f_mgcp_osmux_cid_encode(osmux_cid) }; + /* Osmocom extension: X-Osmux: {*,%u} */ + template MgcpParameter t_MgcpParOsmoIGN(template charstring val) := { + code := "X-OSMO-IGN", + val := val + }; + /* osmo-bsc_mgcp implements L/C/M/X only, osmo-mgw adds 'I' */ /* SDP: osmo-bsc_mgcp implements Tx of v,o,s,c,t,m,a */ diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn index b56734c..01d4d3a 100644 --- a/library/MGCP_Types.ttcn +++ b/library/MGCP_Types.ttcn @@ -30,8 +30,8 @@ type charstring MgcpInfoCode ("B", "C", "I", "N", "X", "L", "M", "R", "S", "D", "O", "P", "E", "Z", "Q", "T", "RC", "LC", "A", "ES", "RM", "RD", "PL", - "MD", "X-OSMO-CP", "X-OSMUX") with { - variant "TEXT_CODING(,convert=upper_case,'([BCINXLMRSDOPEZQTA])|(RC)|(LC)|(ES)|(RM)|(RD)|(PL)|(MD)|(X-OSMO-CP)|(X-OSMUX)',case_insensitive)" + "MD", "X-OSMO-CP", "X-OSMO-IGN", "X-OSMUX") with { + variant "TEXT_CODING(,convert=upper_case,'([BCINXLMRSDOPEZQTA])|(RC)|(LC)|(ES)|(RM)|(RD)|(PL)|(MD)|(X-OSMO-CP)|(X-OSMO-IGN)|(X-OSMUX)',case_insensitive)" }; /* 3.2.2.6 */ diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 4be034b..f6dfe57 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -732,6 +732,35 @@ setverdict(pass); } + /* Test CRCX with X-Osmo-IGN, using same message as SYS#5063 to make sure it doesn't cause a crash. */ + testcase TC_crcx_osmo_ign() runs on dummy_CT { + var template MgcpCommand cmd; + var MgcpResponse resp; + var MgcpEndpoint ep := "7@" & c_mgw_domain; + var MgcpCallId call_id := '3'H; + + f_init(ep); + + /* CRCX 1 7 at mgw MGCP 1.0 + C: 3 + L: p:20, a:GSM-EFR, nt:IN + M: recvonly + X-Osmo-IGN: C + */ + + cmd := ts_CRCX(get_next_trans_id(), ep, "netwtest", call_id); + cmd.params := {ts_MgcpParCallId(call_id), + t_MgcpParLocConnOpt("p:20, a:GSM-EFR, nt:IN"), + t_MgcpParConnMode("recvonly"), + t_MgcpParOsmoIGN("C")}; + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); + extract_conn_id(resp); + + /* clean-up */ + f_dlcx_ok(ep, call_id); + setverdict(pass); + } + /* test CRCX with early bi-directional mode, expect 527 as * bi-diretional media can only be established once both local and * remote side are specified, see MGCP RFC */ @@ -2360,6 +2389,7 @@ execute(TC_crcx_no_lco()); execute(TC_crcx_noprefix()); execute(TC_crcx_unsupp_mode()); + execute(TC_crcx_osmo_ign()); execute(TC_crcx_early_bidir_mode()); execute(TC_crcx_unsupp_param()); execute(TC_crcx_missing_callid()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79415c385e89fe859854430bb20940f078fccea0 Gerrit-Change-Number: 20219 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:34:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:34:00 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: refactor UL burst measurement processing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18973 ) Change subject: osmo-bts-trx/scheduler: refactor UL burst measurement processing ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b02b51fea5664f161382a4ddc63dbf14ffc9ac5 Gerrit-Change-Number: 18973 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Tue, 22 Sep 2020 19:34:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:34:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:34:02 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: refactor UL burst measurement processing In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18973 ) Change subject: osmo-bts-trx/scheduler: refactor UL burst measurement processing ...................................................................... osmo-bts-trx/scheduler: refactor UL burst measurement processing Currently the UL measurements (RSSI, ToA256, C/I) of the burst that concludes a block are passed up to the higher layers. This means that the measurement values of the other bursts are skipped. Let's keep record of all UL measurements and average the values before we pass them up to the higher layers. Use a simple ring buffer to store the measurement history (up to 8 unique entries for now). Remove *_num/*_sum variables from l1sched_chan_state. Change-Id: I2b02b51fea5664f161382a4ddc63dbf14ffc9ac5 Related: OS#3032, OS#2978 --- M include/osmo-bts/scheduler.h M src/osmo-bts-trx/sched_lchan_pdtch.c M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/sched_lchan_xcch.c M src/osmo-bts-trx/scheduler_trx.c 6 files changed, 149 insertions(+), 86 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 0d86347..b488b6c 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -70,6 +70,13 @@ TRX_BURST_8PSK, }; +/* A set of measurements belonging to one Uplink burst */ +struct l1sched_meas_set { + int16_t toa256; /* Timing of Arrival (1/256 of a symbol) */ + int16_t ci_cb; /* Carrier-to-Interference (cB) */ + float rssi; /* RSSI (dBm) */ +}; + /* States each channel on a multiframe */ struct l1sched_chan_state { /* Pointer to the associated logical channel state from gsm_data_shared. @@ -85,14 +92,6 @@ uint32_t ul_first_fn; /* fn of first burst */ uint8_t ul_mask; /* mask of received bursts */ - /* measurements */ - uint8_t rssi_num; /* number of RSSI values */ - float rssi_sum; /* sum of RSSI values */ - uint8_t toa_num; /* number of TOA values */ - int32_t toa256_sum; /* sum of TOA values (1/256 symbol) */ - uint8_t ci_cb_num; /* number of C/I values */ - int32_t ci_cb_sum; /* sum of C/I values (in centiBels) */ - /* loss detection */ uint8_t lost_frames; /* how many L2 frames were lost */ uint32_t last_tdma_fn; /* last processed TDMA frame number */ @@ -126,8 +125,11 @@ uint8_t ul_encr_key[MAX_A5_KEY_LEN]; uint8_t dl_encr_key[MAX_A5_KEY_LEN]; - /* measurements */ - /* TODO: measurement history (ring buffer) will be added here */ + /* Simple ring buffer (up to 8 unique measurements) */ + struct { + struct l1sched_meas_set buf[8]; + unsigned int current; /* current position */ + } meas; /* handover */ bool ho_rach_detect; /* if rach detection is on */ @@ -266,4 +268,20 @@ int trx_sched_route_burst_ind(struct trx_ul_burst_ind *bi, struct l1sched_trx *l1t); int trx_sched_ul_burst(struct l1sched_trx *l1t, struct trx_ul_burst_ind *bi); +/* Averaging mode for trx_sched_meas_avg() */ +enum sched_meas_avg_mode { + /* last 4 bursts (default for xCCH, TCH/H, PTCCH and PDTCH) */ + SCHED_MEAS_AVG_M_QUAD, + /* last 8 bursts (default for TCH/F and FACCH/F) */ + SCHED_MEAS_AVG_M_OCTO, + /* last 6 bursts (default for FACCH/H) */ + SCHED_MEAS_AVG_M_SIX, +}; + +void trx_sched_meas_push(struct l1sched_chan_state *chan_state, + const struct trx_ul_burst_ind *bi); +void trx_sched_meas_avg(const struct l1sched_chan_state *chan_state, + struct l1sched_meas_set *avg, + enum sched_meas_avg_mode mode); + #endif /* TRX_SCHEDULER_H */ diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 259d336..28a45f5 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -46,17 +46,11 @@ sbit_t *burst, **bursts_p = &chan_state->ul_bursts; uint32_t *first_fn = &chan_state->ul_first_fn; uint8_t *mask = &chan_state->ul_mask; - float *rssi_sum = &chan_state->rssi_sum; - uint8_t *rssi_num = &chan_state->rssi_num; - int32_t *toa256_sum = &chan_state->toa256_sum; - uint8_t *toa_num = &chan_state->toa_num; - int32_t *ci_cb_sum = &chan_state->ci_cb_sum; - uint8_t *ci_cb_num = &chan_state->ci_cb_num; + struct l1sched_meas_set meas_avg; uint8_t l2[EGPRS_0503_MAX_BYTES]; int n_errors = 0; int n_bursts_bits = 0; int n_bits_total = 0; - int16_t lqual_cb; uint16_t ber10k; int rc; @@ -76,26 +70,13 @@ memset(*bursts_p, 0, GSM0503_EGPRS_BURSTS_NBITS); *mask = 0x0; *first_fn = bi->fn; - *rssi_sum = 0; - *rssi_num = 0; - *toa256_sum = 0; - *toa_num = 0; - *ci_cb_sum = 0; - *ci_cb_num = 0; } - /* update mask + rssi */ + /* update mask */ *mask |= (1 << bid); - *rssi_sum += bi->rssi; - (*rssi_num)++; - *toa256_sum += bi->toa256; - (*toa_num)++; - /* C/I: Carrier-to-Interference ratio (in centiBels) */ - if (bi->flags & TRX_BI_F_CI_CB) { - *ci_cb_sum += bi->ci_cb; - (*ci_cb_num)++; - } + /* store measurements */ + trx_sched_meas_push(chan_state, bi); /* copy burst to buffer of 4 bursts */ if (bi->burst_len == EGPRS_BURST_LEN) { @@ -114,6 +95,9 @@ if (bid != 3) return 0; + /* average measurements of the last 4 bursts */ + trx_sched_meas_avg(chan_state, &meas_avg, SCHED_MEAS_AVG_M_QUAD); + /* check for complete set of bursts */ if ((*mask & 0xf) != 0xf) { LOGL1S(DL1P, LOGL_DEBUG, l1t, bi->tn, chan, bi->fn, @@ -143,13 +127,11 @@ return 0; } - lqual_cb = *ci_cb_num ? (*ci_cb_sum / *ci_cb_num) : 0; ber10k = compute_ber10k(n_bits_total, n_errors); return _sched_compose_ph_data_ind(l1t, bi->tn, *first_fn, chan, l2, rc, - *rssi_sum / *rssi_num, - *toa256_sum / *toa_num, - lqual_cb, ber10k, + meas_avg.rssi, meas_avg.toa256, + meas_avg.ci_cb, ber10k, PRES_INFO_BOTH); } diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index d289620..e29a47e 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -56,6 +56,8 @@ uint8_t rsl_cmode = chan_state->rsl_cmode; uint8_t tch_mode = chan_state->tch_mode; uint8_t tch_data[128]; /* just to be safe */ + enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_OCTO; + struct l1sched_meas_set meas_avg; int rc, amr = 0; int n_errors = 0; int n_bits_total = 0; @@ -89,6 +91,9 @@ /* update mask */ *mask |= (1 << bid); + /* store measurements */ + trx_sched_meas_push(chan_state, bi); + /* copy burst to end of buffer of 8 bursts */ burst = *bursts_p + bid * 116 + 464; if (bi->burst_len > 0) { @@ -194,6 +199,9 @@ } memcpy(*bursts_p, *bursts_p + 464, 464); + /* average measurements of the last N (depends on mode) bursts */ + trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode); + /* Check if the frame is bad */ if (rc < 0) { LOGL1S(DL1P, LOGL_NOTICE, l1t, bi->tn, chan, bi->fn, @@ -219,10 +227,9 @@ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_F); _sched_compose_ph_data_ind(l1t, bi->tn, fn_begin, chan, tch_data + amr, GSM_MACBLOCK_LEN, - /* FIXME: AVG RSSI and ToA256 */ - bi->rssi, bi->toa256, - 0 /* FIXME: AVG C/I */, - ber10k, PRES_INFO_UNKNOWN); + meas_avg.rssi, meas_avg.toa256, + meas_avg.ci_cb, ber10k, + PRES_INFO_UNKNOWN); bfi: if (rsl_cmode == RSL_CMOD_SPD_SPEECH) { /* indicate bad frame */ @@ -277,8 +284,10 @@ /* TCH or BFI */ compose_l1sap: fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_F); - return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, - tch_data, rc, bi->toa256, ber10k, bi->rssi, is_sub); + return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, tch_data, rc, + /* FIXME: what should we use for BFI here? */ + bfi_flag ? bi->toa256 : meas_avg.toa256, ber10k, + bfi_flag ? bi->rssi : meas_avg.rssi, is_sub); } /* common section for generation of TCH bursts (TCH/H and TCH/F). @@ -293,9 +302,6 @@ uint8_t rsl_cmode = chan_state->rsl_cmode; uint8_t tch_mode = chan_state->tch_mode; struct osmo_phsap_prim *l1sap; - int32_t *toa256_sum = &chan_state->toa256_sum; - uint8_t *toa_num = &chan_state->toa_num; - int16_t toa256; /* handle loss detection of received TCH frames */ if (rsl_cmode == RSL_CMOD_SPD_SPEECH @@ -343,14 +349,9 @@ } if (len) { - if (*toa_num == 0) - toa256 = 0; - else - toa256 = *toa256_sum / *toa_num; - - /* Note: RSSI is set to 0 to indicate to the higher + /* Note: RSSI/ToA256 is set to 0 to indicate to the higher * layers that this is a faked tch_ind */ - _sched_compose_tch_ind(l1t, tn, fn, chan, tch_data, len, toa256, 10000, 0, 0); + _sched_compose_tch_ind(l1t, tn, fn, chan, tch_data, len, 0, 10000, 0, 0); } } diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 0281342..2a561e1 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -65,6 +65,8 @@ * Even FN ending at: 10,11,19,20,2,3 */ int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; + enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_QUAD; + struct l1sched_meas_set meas_avg; unsigned int fn_begin; uint16_t ber10k; uint8_t is_sub = 0; @@ -94,6 +96,9 @@ /* update mask */ *mask |= (1 << bid); + /* store measurements */ + trx_sched_meas_push(chan_state, bi); + /* copy burst to end of buffer of 6 bursts */ burst = *bursts_p + bid * 116 + 464; if (bi->burst_len > 0) { @@ -208,6 +213,10 @@ memcpy(*bursts_p + 232, *bursts_p + 464, 232); ber10k = compute_ber10k(n_bits_total, n_errors); + /* average measurements of the last N (depends on mode) bursts */ + if (rc == GSM_MACBLOCK_LEN) + meas_avg_mode = SCHED_MEAS_AVG_M_SIX; + trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode); /* Check if the frame is bad */ if (rc < 0) { @@ -238,10 +247,9 @@ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H1); _sched_compose_ph_data_ind(l1t, bi->tn, fn_begin, chan, tch_data + amr, GSM_MACBLOCK_LEN, - /* FIXME: AVG both RSSI and ToA */ - bi->rssi, bi->toa256, - 0 /* FIXME: AVG C/I */, - ber10k, PRES_INFO_UNKNOWN); + meas_avg.rssi, meas_avg.toa256, + meas_avg.ci_cb, ber10k, + PRES_INFO_UNKNOWN); bfi: /* FIXME: a FACCH/H frame replaces two speech frames, * so we actually need to send two bad frame indications! */ @@ -301,8 +309,10 @@ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H0); else fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H1); - return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, - tch_data, rc, bi->toa256, ber10k, bi->rssi, is_sub); + return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, tch_data, rc, + /* FIXME: what should we use for BFI here? */ + bfi_flag ? bi->toa256 : meas_avg.toa256, ber10k, + bfi_flag ? bi->rssi : meas_avg.rssi, is_sub); } /* common section for generation of TCH bursts (TCH/H and TCH/F). diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index e2670d8..b96bc0b 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -43,16 +43,10 @@ sbit_t *burst, **bursts_p = &chan_state->ul_bursts; uint32_t *first_fn = &chan_state->ul_first_fn; uint8_t *mask = &chan_state->ul_mask; - float *rssi_sum = &chan_state->rssi_sum; - uint8_t *rssi_num = &chan_state->rssi_num; - int32_t *toa256_sum = &chan_state->toa256_sum; - uint8_t *toa_num = &chan_state->toa_num; - int32_t *ci_cb_sum = &chan_state->ci_cb_sum; - uint8_t *ci_cb_num = &chan_state->ci_cb_num; uint8_t l2[GSM_MACBLOCK_LEN], l2_len; + struct l1sched_meas_set meas_avg; int n_errors = 0; int n_bits_total = 0; - int16_t lqual_cb; uint16_t ber10k; int rc; @@ -76,26 +70,13 @@ memset(*bursts_p, 0, 464); *mask = 0x0; *first_fn = bi->fn; - *rssi_sum = 0; - *rssi_num = 0; - *toa256_sum = 0; - *toa_num = 0; - *ci_cb_sum = 0; - *ci_cb_num = 0; } - /* update mask + RSSI */ + /* update mask */ *mask |= (1 << bid); - *rssi_sum += bi->rssi; - (*rssi_num)++; - *toa256_sum += bi->toa256; - (*toa_num)++; - /* C/I: Carrier-to-Interference ratio (in centiBels) */ - if (bi->flags & TRX_BI_F_CI_CB) { - *ci_cb_sum += bi->ci_cb; - (*ci_cb_num)++; - } + /* store measurements */ + trx_sched_meas_push(chan_state, bi); /* Copy burst to buffer of 4 bursts. If the burst indication contains * no data, ensure that the buffer does not stay uninitialized */ @@ -110,6 +91,9 @@ if (bid != 3) return 0; + /* average measurements of the last 4 bursts */ + trx_sched_meas_avg(chan_state, &meas_avg, SCHED_MEAS_AVG_M_QUAD); + /* check for complete set of bursts */ if ((*mask & 0xf) != 0xf) { LOGL1S(DL1P, LOGL_NOTICE, l1t, bi->tn, chan, bi->fn, @@ -134,13 +118,11 @@ } else l2_len = GSM_MACBLOCK_LEN; - lqual_cb = *ci_cb_num ? (*ci_cb_sum / *ci_cb_num) : 0; ber10k = compute_ber10k(n_bits_total, n_errors); return _sched_compose_ph_data_ind(l1t, bi->tn, *first_fn, chan, l2, l2_len, - *rssi_sum / *rssi_num, - *toa256_sum / *toa_num, - lqual_cb, ber10k, + meas_avg.rssi, meas_avg.toa256, + meas_avg.ci_cb, ber10k, PRES_INFO_UNKNOWN); } diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index e79e674..3921280 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -473,3 +473,73 @@ else trx_if_cmd_nohandover(l1h, tn, ss); } + +/* Add a set of UL burst measurements to the history */ +void trx_sched_meas_push(struct l1sched_chan_state *chan_state, + const struct trx_ul_burst_ind *bi) +{ + unsigned int hist_size = ARRAY_SIZE(chan_state->meas.buf); + unsigned int current = chan_state->meas.current; + + chan_state->meas.buf[current] = (struct l1sched_meas_set) { + .ci_cb = (bi->flags & TRX_BI_F_CI_CB) ? bi->ci_cb : 0, + .toa256 = bi->toa256, + .rssi = bi->rssi, + }; + + chan_state->meas.current = (current + 1) % hist_size; +} + +/* Calculate the AVG of n measurements from the history */ +void trx_sched_meas_avg(const struct l1sched_chan_state *chan_state, + struct l1sched_meas_set *avg, + enum sched_meas_avg_mode mode) +{ + unsigned int hist_size = ARRAY_SIZE(chan_state->meas.buf); + unsigned int current = chan_state->meas.current; + const struct l1sched_meas_set *set; + unsigned int shift, pos, i, n; + + float rssi_sum = 0; + int toa256_sum = 0; + int ci_cb_sum = 0; + + switch (mode) { + /* last 4 bursts (default for xCCH, TCH/H, PTCCH and PDTCH) */ + case SCHED_MEAS_AVG_M_QUAD: + n = 4; shift = n; + break; + /* last 8 bursts (default for TCH/F and FACCH/F) */ + case SCHED_MEAS_AVG_M_OCTO: + n = 8; shift = n; + break; + /* last 6 bursts (default for FACCH/H) */ + case SCHED_MEAS_AVG_M_SIX: + n = 6; shift = n; + break; + default: + /* Shall not happen */ + OSMO_ASSERT(false); + } + + /* Calculate the sum of n entries starting from pos */ + for (i = 0; i < n; i++) { + pos = (current + hist_size - shift + i) % hist_size; + set = &chan_state->meas.buf[pos]; + + rssi_sum += set->rssi; + toa256_sum += set->toa256; + ci_cb_sum += set->ci_cb; + } + + /* Calculate the average for each value */ + *avg = (struct l1sched_meas_set) { + .rssi = (rssi_sum / n), + .toa256 = (toa256_sum / n), + .ci_cb = (ci_cb_sum / n), + }; + + LOGP(DL1C, LOGL_DEBUG, "Measurement AVG (num=%u, shift=%u): " + "RSSI %f, ToA256 %d, C/I %d cB\n", n, shift, + avg->rssi, avg->toa256, avg->ci_cb); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b02b51fea5664f161382a4ddc63dbf14ffc9ac5 Gerrit-Change-Number: 18973 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:34:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 22 Sep 2020 19:34:27 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 22 Sep 2020 19:34:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 19:53:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 19:53:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 3: Daniel wrote: > But why shouldn't we verify the counters for regular tests? Pau wrote: > This is an ongoing discussion in lots of places where AFAIU fixeria wants to test only one and one only thing on each test while other people prefer testing all possibles parts are working fine on each scenario. I'm of the opinion we should do the later. Indeed, I stand for the idea of testing something specific rather than as much as possible in one test case. This way if you see some test case failing, you have more chances to guess what exactly is broken and where the potential regression is. And this is kind of a natural intention when you're designing and implementing a new test case - to make it concrete, short, and simple. Nobody wants to see TC_everything, right? Daniel wrote: > One reason would be because a counter failure would fail a test that tests the actual functionality while the functionality still works. I'm not sure how often that will happen, though and if/once we trust our counters they can also help verify assumptions made in a testcase. A good example is ttcn3-bsc-test-latest, where most of the handover test cases fail because of some counter mismatches. It's clear to us, developers, that it's not a problem in the actual logic, and let's say a missing counter increment. However what would a potential customer see is that some test cases are failing, and he/she would unlikely want to investigate why. Given out release tagging intervals... this approach promises a negative trend for the 'latest' feeds. Another reason is that changing the test logic may potentially change the counter test coverage. Let's say I found an easier way to trigger sending of some specific message, so I remove half of a test, and some related counters never change after that. In any case, if the majority of you vote for having counters mixed with the existing test cases, let's accept this as a general policy (so I won't annoy you with 'one specific thing' philosophy) and ensure that we check counters in all test cases, not just in 2/74. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 19:53:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 20:05:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 20:05:47 +0000 Subject: Change in osmo-bsc[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19670 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 6: As I already mentioned in the related ticket, several new configuration commands were introduced, so this patch needs to be revisited. Marking as WIP for now to prevent merging in an incomplete state. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51 Gerrit-Change-Number: 19670 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 20:05:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 22 21:23:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 22 Sep 2020 21:23:34 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 22 Sep 2020 21:23:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Sep 23 01:40:28 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 23 Sep 2020 01:40:28 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f6aa798e93_59802b1de2a0a610342169@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 161s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 161s] [COMPILING libboard/qmod/source/card_pres.c] [ 161s] [COMPILING libboard/qmod/source/wwan_led.c] [ 161s] [COMPILING libboard/qmod/source/i2c.c] [ 161s] [COMPILING libboard/qmod/source/board_qmod.c] [ 162s] [COMPILING apps/dfu/main.c] [ 162s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 162s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 162s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 162s] Memory region Used Size Region Size %age Used [ 162s] rom: 16588 B 16 KB 101.25% [ 162s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 162s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 162s] collect2: error: ld returned 1 exit status [ 162s] % [ 162s] make[2]: *** [Makefile:234: flash] Error 1 [ 162s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 162s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] dh_auto_build: error: make -j1 returned exit code 2 [ 162s] make: *** [debian/rules:16: build] Error 25 [ 162s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 162s] ### VM INTERACTION START ### [ 165s] [ 155.915726] sysrq: Power Off [ 165s] [ 155.923156] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb20 failed "build simtrace2_0.7.0.63.39070.dsc" at Wed Sep 23 01:40:00 UTC 2020. [ 165s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 23 04:53:07 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 23 Sep 2020 04:53:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5f6ad4b588d10_59802b1de2a0a61036329a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-uecups failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild22:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 23 05:14:52 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 23 Sep 2020 05:14:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_10/armv7l In-Reply-To: References: Message-ID: <5f6ad9ea1dd27_59802b1de2a0a6103671cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_10/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild18:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 23 05:17:09 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 23 Sep 2020 05:17:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5f6ada6538915_59802b1de2a0a6103672d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-6:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Sep 23 07:39:10 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 07:39:10 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 to look at the new patch set (#2). Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" Include the IMEI and the last seen time in an import from an osmo-nitb database. Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 --- M src/hlr_db_tool.c 1 file changed, 90 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/19914/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 08:34:36 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 08:34:36 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19914 ) Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: neels Gerrit-Comment-Date: Wed, 23 Sep 2020 08:34:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 08:36:36 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 08:36:36 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19914 ) Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/19914/5/src/hlr_db_tool.c File src/hlr_db_tool.c: https://gerrit.osmocom.org/c/osmo-hlr/+/19914/5/src/hlr_db_tool.c at 219 PS5, Line 219: " FROM Subscriber s LEFT JOIN" Using LEFT JOIN to include subs with no IMEI. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: neels Gerrit-Comment-Date: Wed, 23 Sep 2020 08:36:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 08:40:37 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 08:40:37 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19914 ) Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: neels Gerrit-Comment-Date: Wed, 23 Sep 2020 08:40:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 09:18:36 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 23 Sep 2020 09:18:36 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: deprecate bind early command In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 to look at the new patch set (#2). Change subject: mgcp_vty: deprecate bind early command ...................................................................... mgcp_vty: deprecate bind early command The VTY command "bind early" is deprecated but it prints an error message and the DEFUN is not set to DEFUN_DEPRECATED. Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/48/20248/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 Gerrit-Change-Number: 20248 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 09:23:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 23 Sep 2020 09:23:17 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: deprecate bind early command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20248 ) Change subject: mgcp_vty: deprecate bind early command ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/20248/1/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/20248/1/src/libosmo-mgcp/mgcp_vty.c at 451 PS1, Line 451: CMD_WARNING > CMD_ERROR ends config file parsing, but CMD_WARNING shouldn't, AFAIR. I just checked: there is no CMD_ERROR in the VTY API, only CMD_WARNING. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 Gerrit-Change-Number: 20248 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 09:23:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 09:33:23 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 09:33:23 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 to look at the new patch set (#6). Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" Include the IMEI and the last seen time in an import from an osmo-nitb database. Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 --- M src/hlr_db_tool.c 1 file changed, 99 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/19914/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 09:45:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 23 Sep 2020 09:45:16 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix indentation of for loops In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20252 ) Change subject: cosmetic: Fix indentation of for loops ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777 Gerrit-Change-Number: 20252 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 23 Sep 2020 09:45:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 10:45:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 23 Sep 2020 10:45:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20250 ) Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... Patch Set 2: > Patch Set 1: > > Still wondering if every command should also get a MGW_VTY_ATTR_RESTART_FULL... Let's discuss here: https://lists.osmocom.org/pipermail/openbsc/2020-September/013259.html. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 23 Sep 2020 10:45:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 11:23:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 11:23:01 +0000 Subject: Change in osmo-pcu[master]: vty: Add 'show bts pdch' command In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20251 ) Change subject: vty: Add 'show bts pdch' command ...................................................................... vty: Add 'show bts pdch' command This allows to see which channels have been enabled according to PCU. Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 --- M src/pcu_vty.c M src/pcu_vty_functions.cpp M src/pcu_vty_functions.h 3 files changed, 38 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 99c92b7..0756136 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -828,6 +828,14 @@ return CMD_SUCCESS; } +DEFUN(show_bts_pdch, + show_bts_pdch_cmd, + "show bts pdch", + SHOW_STR "BTS related functionality\nPDCH timeslots\n") +{ + return pcu_vty_show_bts_pdch(vty, bts_main_data()); +} + #define IDLE_TIME_STR "keep an idle DL TBF alive for the time given\n" DEFUN_DEPRECATED(cfg_pcu_dl_tbf_idle_time, cfg_pcu_dl_tbf_idle_time_cmd, @@ -1273,6 +1281,7 @@ install_element(PCU_NODE, &cfg_pcu_timer_cmd); install_element_ve(&show_bts_stats_cmd); + install_element_ve(&show_bts_pdch_cmd); install_element_ve(&show_tbf_cmd); install_element_ve(&show_ms_all_cmd); install_element_ve(&show_ms_tlli_cmd); diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 3e9973c..33a4637 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -239,3 +239,31 @@ return show_ms(vty, ms); } + +int pcu_vty_show_bts_pdch(struct vty *vty, const struct gprs_rlcmac_bts *bts_data) +{ + unsigned int trx_nr, ts_nr; + + vty_out(vty, "BTS (%s)%s", bts_data->active ? "active" : "disabled", VTY_NEWLINE); + for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts_data->trx); trx_nr++) { + const struct gprs_rlcmac_trx *trx = &bts_data->trx[trx_nr]; + + for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { + if (trx->pdch[ts_nr].is_enabled()) + break; + } + if (ts_nr == ARRAY_SIZE(trx->pdch)) + continue; /* no pdch active, skip */ + + vty_out(vty, " TRX%u%s", trx->trx_no, VTY_NEWLINE); + for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { + const struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts_nr]; + + vty_out(vty, " TS%u: PDCH %s, %u UL TBFs, %u DL TBFs%s", pdch->ts_no, + pdch->is_enabled() ? "enabled" : "disabled", + pdch->num_tbfs(GPRS_RLCMAC_DL_TBF), + pdch->num_tbfs(GPRS_RLCMAC_UL_TBF), VTY_NEWLINE); + } + } + return CMD_SUCCESS; +} diff --git a/src/pcu_vty_functions.h b/src/pcu_vty_functions.h index 6fbc366..4528fb2 100644 --- a/src/pcu_vty_functions.h +++ b/src/pcu_vty_functions.h @@ -33,7 +33,7 @@ uint32_t tlli); int pcu_vty_show_ms_by_imsi(struct vty *vty, struct gprs_rlcmac_bts *bts_data, const char *imsi); - +int pcu_vty_show_bts_pdch(struct vty *vty, const struct gprs_rlcmac_bts *bts_data); #ifdef __cplusplus } #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If72e67ba80aab4e0c68408e6996d74d2ff70c322 Gerrit-Change-Number: 20251 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 11:23:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 11:23:05 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix indentation of for loops In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20252 ) Change subject: cosmetic: Fix indentation of for loops ...................................................................... cosmetic: Fix indentation of for loops Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 48 insertions(+), 48 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index c4fbbad..836dab5 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -562,70 +562,70 @@ mslot_fill_rx_mask(mslot_class, num_tx, rx_mask); - /* Rotate group of TX slots: UUU-----, -UUU----, ..., UU-----U */ - for (ul_ts = 0; ul_ts < 8; ul_ts += 1, tx_valid_win <<= 1) { - uint16_t rx_valid_win; - uint32_t checked_rx[256/32] = {0}; + /* Rotate group of TX slots: UUU-----, -UUU----, ..., UU-----U */ + for (ul_ts = 0; ul_ts < 8; ul_ts += 1, tx_valid_win <<= 1) { + uint16_t rx_valid_win; + uint32_t checked_rx[256/32] = {0}; - /* Wrap valid window */ - tx_valid_win = mslot_wrap_window(tx_valid_win); + /* Wrap valid window */ + tx_valid_win = mslot_wrap_window(tx_valid_win); - tx_window = tx_valid_win; + tx_window = tx_valid_win; - /* Filter out unavailable slots */ - tx_window &= *ul_slots; + /* Filter out unavailable slots */ + tx_window &= *ul_slots; - /* Skip if the the first TS (ul_ts) is not in the set */ - if ((tx_window & (1 << ul_ts)) == 0) - continue; + /* Skip if the the first TS (ul_ts) is not in the set */ + if ((tx_window & (1 << ul_ts)) == 0) + continue; - /* Skip if the the last TS (ul_ts+num_tx-1) is not in the set */ - if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0) - continue; + /* Skip if the the last TS (ul_ts+num_tx-1) is not in the set */ + if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0) + continue; - rx_valid_win = (1 << OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx)) - 1; + rx_valid_win = (1 << OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx)) - 1; - /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */ - for (dl_ts = 0; dl_ts < 8; dl_ts += 1, rx_valid_win <<= 1) { - /* Wrap valid window */ - rx_valid_win = (rx_valid_win | rx_valid_win >> 8) & 0xff; + /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */ + for (dl_ts = 0; dl_ts < 8; dl_ts += 1, rx_valid_win <<= 1) { + /* Wrap valid window */ + rx_valid_win = (rx_valid_win | rx_valid_win >> 8) & 0xff; - /* Validate with both Tta/Ttb/Trb and Ttb/Tra/Trb */ - for (mask_sel = MASK_TT; mask_sel <= MASK_TR; mask_sel += 1) { - int capacity; + /* Validate with both Tta/Ttb/Trb and Ttb/Tra/Trb */ + for (mask_sel = MASK_TT; mask_sel <= MASK_TR; mask_sel += 1) { + int capacity; - rx_window = mslot_filter_bad(rx_mask[mask_sel], ul_ts, *dl_slots, rx_valid_win); - if (rx_window < 0) - continue; + rx_window = mslot_filter_bad(rx_mask[mask_sel], ul_ts, *dl_slots, rx_valid_win); + if (rx_window < 0) + continue; - if (skip_slot(mslot_class, mask_sel != MASK_TT, rx_window, tx_window, checked_rx)) - continue; + if (skip_slot(mslot_class, mask_sel != MASK_TT, rx_window, tx_window, checked_rx)) + continue; - /* Compute capacity */ - capacity = compute_capacity(trx, rx_window, tx_window); + /* Compute capacity */ + capacity = compute_capacity(trx, rx_window, tx_window); #ifdef ENABLE_TS_ALLOC_DEBUG - LOGP(DRLCMAC, LOGL_DEBUG, - "- Considering DL/UL slots: (TS=0)\"%s\"(TS=7), " - "capacity = %d\n", - set_flag_chars(set_flag_chars(set_flag_chars(set_flag_chars( - slot_info, - rx_bad, 'x', '.'), - rx_window, 'D'), - tx_window, 'U'), - rx_window & tx_window, 'C'), - capacity); + LOGP(DRLCMAC, LOGL_DEBUG, + "- Considering DL/UL slots: (TS=0)\"%s\"(TS=7), " + "capacity = %d\n", + set_flag_chars(set_flag_chars(set_flag_chars(set_flag_chars( + slot_info, + rx_bad, 'x', '.'), + rx_window, 'D'), + tx_window, 'U'), + rx_window & tx_window, 'C'), + capacity); #endif - if (capacity <= max_capacity) - continue; + if (capacity <= max_capacity) + continue; - max_capacity = capacity; - max_ul_slots = tx_window; - max_dl_slots = rx_window; - } - } - } + max_capacity = capacity; + max_ul_slots = tx_window; + max_dl_slots = rx_window; + } + } + } } if (!max_ul_slots || !max_dl_slots) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777 Gerrit-Change-Number: 20252 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 11:23:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 11:23:07 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20253 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I6567065b8ec0082b21c371bbd0c2e85fecc96c90 --- M src/tbf.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/tbf.h b/src/tbf.h index 99aba67..936ff65 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -275,8 +275,8 @@ enum gprs_rlcmac_tbf_direction direction; struct gprs_rlcmac_trx *trx; uint8_t first_ts; /* first TS used by TBF */ - uint8_t first_common_ts; /* first TS that the phone can send and - reveive simultaniously */ + uint8_t first_common_ts; /* first TS where the phone can send and + receive simultaniously */ uint8_t control_ts; /* timeslot control messages and polling */ struct gprs_rlcmac_pdch *pdch[8]; /* list of PDCHs allocated to TBF */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6567065b8ec0082b21c371bbd0c2e85fecc96c90 Gerrit-Change-Number: 20253 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 11:23:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 11:23:08 +0000 Subject: Change in osmo-pcu[master]: Fix crash accessing NULL tbf->pdch[first_ts] In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20254 ) Change subject: Fix crash accessing NULL tbf->pdch[first_ts] ...................................................................... Fix crash accessing NULL tbf->pdch[first_ts] Fixes consistent crash under some specific scenarios explained in OS#4756. The crash was caused due to a bug in channel allocator algorithm incorrectly populating tbf->pdch[] array as a result of mismatching first_ts and resulting pdch selected slot bitmask. The issue happens because when allocating a UL TBF in allocator B, the subset is always further forced into allocating one single TS. As a result, on that branch several variables are updated, but first_ts was not. The field used to be updated in older versions, but a bug was introduced during code refactoring in commit listed below (31 Jan 2018). Fixes: 0cc7212cfdfd40e87b531ecf14e76356185f4036 Related: OS#4756 Change-Id: I79596803f7dab6f21b58bfe39c2af65d9c5b39d5 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 836dab5..496d19b 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -896,8 +896,6 @@ if (rc < 0) return -EINVAL; - first_ts = ffs(rc) - 1; - /* Step 3b: Derive the slot set for a given direction */ if (tbf->direction == GPRS_RLCMAC_DL_TBF) { dl_slots = rc; @@ -914,6 +912,7 @@ update_slot_counters(ul_slots, reserved_ul_slots, &slotcount, &avail_count); } + first_ts = ffs(rc) - 1; first_common_ts = ffs(dl_slots & ul_slots) - 1; if (first_common_ts < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I79596803f7dab6f21b58bfe39c2af65d9c5b39d5 Gerrit-Change-Number: 20254 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 11:37:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 11:37:21 +0000 Subject: Change in osmo-ci[master]: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/20255 ) Change subject: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions ...................................................................... build-old-tags-against-master: Ignore some osmo-bts and openbsc versions Some unit tests in those repositories started failing due to a fix in libosmocore logging system where extra coloring tags were printed when not needed. Unit tests in current master of those repositories are fixed to work with both old and new versions of libosmocore since they got coloring disabled in their output, and new patch releases have been done containing the fix, which means last releases already work with both libosmocore version. However, older releases are expected to fail when built against libosmocore master. Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 --- M scripts/osmocom-build-old-tags-against-master.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/20255/1 diff --git a/scripts/osmocom-build-old-tags-against-master.sh b/scripts/osmocom-build-old-tags-against-master.sh index cd05dfb..e0abe8c 100755 --- a/scripts/osmocom-build-old-tags-against-master.sh +++ b/scripts/osmocom-build-old-tags-against-master.sh @@ -52,6 +52,8 @@ case "$1" in openbsc) echo "1.0.0" # testsuite + echo "1.3.1" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc + echo "1.3.2" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc ;; osmo-bsc) # Depends on libosmo-legacy-mgcp, but missing LIBOSMOLEGACYMGCP_CFLAGS so we can't build it with @@ -61,6 +63,8 @@ ;; osmo-bts) echo "1.0.0" # missing gsm0808.h include, fixed in 1.0.1 + echo "1.2.0" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc + echo "1.2.1" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc ;; osmo-mgw) echo "1.3.0" # testsuite -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 Gerrit-Change-Number: 20255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 11:38:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 11:38:18 +0000 Subject: Change in osmo-ci[master]: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20255 ) Change subject: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 Gerrit-Change-Number: 20255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 11:38:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 11:52:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 11:52:45 +0000 Subject: Change in osmo-bsc[master]: bssap: Use new DTAP DLCI helper fields from libosmocore In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/16260 to look at the new patch set (#2). Change subject: bssap: Use new DTAP DLCI helper fields from libosmocore ...................................................................... bssap: Use new DTAP DLCI helper fields from libosmocore This is the only place where the entire dtap header is passed, where the split between SAPI and CHAN is done. Other places in osmo-bsc pass around a link_id integer containing everything, so leaving that out of the scope for this patch. The gsm0406_dlci_sapi_name() API was introduced in libosmocore 1.3.0, and osmo-bsc currently requires libosmocore 1.4.0, so it means we are not further restricting libosmocore dependency here by using it. Change-Id: Ib72e2bda46e39d1075e4270ac5fa51df2f418164 --- 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/60/16260/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib72e2bda46e39d1075e4270ac5fa51df2f418164 Gerrit-Change-Number: 16260 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 13:16:52 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 13:16:52 +0000 Subject: Change in osmo-bsc[master]: bssap: Use new DTAP DLCI helper fields from libosmocore In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16260 ) Change subject: bssap: Use new DTAP DLCI helper fields from libosmocore ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib72e2bda46e39d1075e4270ac5fa51df2f418164 Gerrit-Change-Number: 16260 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 23 Sep 2020 13:16:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 13:19:55 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 13:19:55 +0000 Subject: Change in osmo-ci[master]: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20255 ) Change subject: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/20255/1/scripts/osmocom-build-old-tags-against-master.sh File scripts/osmocom-build-old-tags-against-master.sh: https://gerrit.osmocom.org/c/osmo-ci/+/20255/1/scripts/osmocom-build-old-tags-against-master.sh at 55 PS1, Line 55: echo "1.3.1" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc i'm curious: what do you mean by this commit hash? (and why do most comments say "testsuite"?) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 Gerrit-Change-Number: 20255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 13:19:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 13:28:06 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 13:28:06 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19914 ) Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... Patch Set 6: Code-Review+2 (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/19914/5/src/hlr_db_tool.c File src/hlr_db_tool.c: https://gerrit.osmocom.org/c/osmo-hlr/+/19914/5/src/hlr_db_tool.c at 523 PS5, Line 523: /* db_close wiill only finalize statments in 'wiill' it is ok to use 120 line width https://gerrit.osmocom.org/c/osmo-hlr/+/19914/5/src/hlr_db_tool.c at 527 PS5, Line 527: sqlite3_finalize(hlr_db_stmt[i]); nice, i didn't realize / forgot about this one -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 23 Sep 2020 13:28:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 13:33:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 13:33:38 +0000 Subject: Change in osmo-ci[master]: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20255 ) Change subject: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/20255/1/scripts/osmocom-build-old-tags-against-master.sh File scripts/osmocom-build-old-tags-against-master.sh: https://gerrit.osmocom.org/c/osmo-ci/+/20255/1/scripts/osmocom-build-old-tags-against-master.sh at 55 PS1, Line 55: echo "1.3.1" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc > i'm curious: what do you mean by this commit hash? [?] testsuite means AFAIU that it fails due to unit tests not passing anymore due to changes in libraries modifying the output (such as the case in this commit). In this case, I'm simply describing in the comment further information about the component and master commit which made the tests no pass anymore on old versions, in case someone wants to find out for whatever reason. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 Gerrit-Change-Number: 20255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 13:33:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 13:36:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 13:36:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: bsc: Fix indentation alignment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20256 ) Change subject: cosmetic: bsc: Fix indentation alignment ...................................................................... cosmetic: bsc: Fix indentation alignment Change-Id: I5484784fca254044055a9f131e1ebb19de8ceba5 --- M bsc/BSC_Tests.ttcn 1 file changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/20256/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8934f42..8e33226 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3613,57 +3613,57 @@ /* Set S1, we expect an AMR multirate configuration IE with all four rates * set. */ testcase TC_assignment_codec_amr_f_S1() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); + f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); } /* Set S1, we expect an AMR multirate configuration IE with the lower three * rates set. */ testcase TC_assignment_codec_amr_h_S1() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); + f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_f_S124() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); + f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_h_S124() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); + f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); } /* The following block of tests selects more and more rates until all four * possible rates are in the active set (full rate) */ testcase TC_assignment_codec_amr_f_S0() runs on test_CT { - f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); + f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); } testcase TC_assignment_codec_amr_f_S02() runs on test_CT { - f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); + f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); } testcase TC_assignment_codec_amr_f_S024() runs on test_CT { - f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); + f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); } testcase TC_assignment_codec_amr_f_S0247() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); + f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); } /* The following block of tests selects more and more rates until all three * possible rates are in the active set (half rate) */ testcase TC_assignment_codec_amr_h_S0() runs on test_CT { - f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); + f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); } testcase TC_assignment_codec_amr_h_S02() runs on test_CT { - f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); + f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); } testcase TC_assignment_codec_amr_h_S024() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); + f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); } /* The following block tests what happens when the MSC does offer rate @@ -3673,38 +3673,38 @@ * to offer rates that are not applicable anyway. */ testcase TC_assignment_codec_amr_h_S0247() runs on test_CT { - /* Try to include 12,2k in into the active set even though the channel - * is half rate only. The BSC is expected to remove the 12,0k */ - f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); + /* Try to include 12,2k in into the active set even though the channel + * is half rate only. The BSC is expected to remove the 12,0k */ + f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); } testcase TC_assignment_codec_amr_f_S01234567() runs on test_CT { - /* See what happens when all rates are selected at once. Since then - * Also S1 is selected, this setting will be prefered and we should - * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); + /* See what happens when all rates are selected at once. Since then + * Also S1 is selected, this setting will be prefered and we should + * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ + f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); } testcase TC_assignment_codec_amr_f_S0234567() runs on test_CT { - /* Same as above, but with S1 missing, the MSC is then expected to - * select the currently supported rates, which are also 12.2k, 7,40k, - * 5,90k, and 4,75k, into the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); + /* Same as above, but with S1 missing, the MSC is then expected to + * select the currently supported rates, which are also 12.2k, 7,40k, + * 5,90k, and 4,75k, into the active set. */ + f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); } testcase TC_assignment_codec_amr_f_zero() runs on test_CT { - /* Try to select no rates at all */ - f_TC_assignment_codec_amr_fail(true, '00000000'B); + /* Try to select no rates at all */ + f_TC_assignment_codec_amr_fail(true, '00000000'B); } testcase TC_assignment_codec_amr_f_unsupp() runs on test_CT { - /* Try to select only unsupported rates */ - f_TC_assignment_codec_amr_fail(true, '01101000'B); + /* Try to select only unsupported rates */ + f_TC_assignment_codec_amr_fail(true, '01101000'B); } testcase TC_assignment_codec_amr_h_S7() runs on test_CT { - /* Try to select 12,2k for half rate */ - f_TC_assignment_codec_amr_fail(false, '10000000'B); + /* Try to select 12,2k for half rate */ + f_TC_assignment_codec_amr_fail(false, '10000000'B); } private function f_disable_all_tch_f() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5484784fca254044055a9f131e1ebb19de8ceba5 Gerrit-Change-Number: 20256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 13:36:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 13:36:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Call f_shutdown_helper() on all tests missing it References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 ) Change subject: bsc: Call f_shutdown_helper() on all tests missing it ...................................................................... bsc: Call f_shutdown_helper() on all tests missing it This should hopefully avoid sporadic errors during tear down of tests such as TC_si_acc_rotate. Change-Id: I8c8a1061b546576b7a5c4b11f20dfc887aaab6e0 --- M bsc/BSC_Tests.ttcn 1 file changed, 145 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/20257/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8e33226..a53f578 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1148,7 +1148,7 @@ IPA_RSL[0].send(ts_ASP_RSL_UD(ts_RSL_CHAN_RQD('23'O, 23))); rsl_unused := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); - setverdict(pass); + f_shutdown_helper(); } /* verify if the "chreq:total" counter increments as expected */ @@ -1164,7 +1164,7 @@ rsl_unused := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total", chreq_total+1); - setverdict(pass); + f_shutdown_helper(); } /* CHAN RQD -> CHAN ACT -> CHAN ACT ACK -> RF CHAN REL */ @@ -1177,7 +1177,7 @@ /* expect BSC to disable the channel again if there's no RLL EST IND */ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL), T3101_MAX); - setverdict(pass); + f_shutdown_helper(); } /* Normal variant */ @@ -1236,7 +1236,7 @@ /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if MSC answers with CREF to CR */ @@ -1257,7 +1257,7 @@ /* expect BSC to disable the channel */ f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* CHAN RQD -> CHAN ACT -> CHAN ACT NACK -> RF CHAN REL */ @@ -1280,7 +1280,7 @@ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chan_act:nack", chact_nack+1); - setverdict(pass); + f_shutdown_helper(); } /* Test for channel exhaustion due to RACH overload */ @@ -1329,6 +1329,7 @@ } [] IPA_RSL[0].receive { repeat; } } + f_shutdown_helper(); } /* Test channel deactivation due to silence from MS */ @@ -1360,6 +1361,7 @@ setverdict(fail, "Unexpected RSL message!"); } } + f_shutdown_helper(); } /*********************************************************************** @@ -1374,7 +1376,7 @@ BSSAP.send(ts_BSSAP_CONNECT_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own, 2342, ts_BSSMAP_AssignmentReq)); BSSAP.receive(tr_BSSAP_DISC_ind(2342, ?, ?)); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if MSC answers with CREF to CR */ @@ -1405,6 +1407,7 @@ } [] BSSAP.receive { repeat; } } + f_shutdown_helper(); } /* generate an assignment request for either AoIP or SCCPlite */ @@ -1492,6 +1495,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); + f_shutdown_helper(); } testcase TC_assignment_ctm() runs on test_CT { @@ -1500,6 +1504,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCTM); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for Speech+CTM"); + f_shutdown_helper(); } type record DchanTuple { @@ -1577,7 +1582,7 @@ /* wait for SCCP emulation to do its job */ f_sleep(1.0); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after CONN FAIL IND from BTS */ @@ -1606,7 +1611,7 @@ /* wait for SCCP emulation to do its job */ f_sleep(1.0); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of early CONN FAIL IND from BTS (before EST IND!) */ @@ -1629,7 +1634,7 @@ /* BTS<-BSC: respond with CHAN REL ACK */ f_ipa_tx(0, ts_RSL_RF_CHAN_REL_ACK(dt.rsl_chan_nr)); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of late CONN FAIL IND from BTS (ater REL IND!) */ @@ -1662,7 +1667,7 @@ /* BSC<-MSC: MSC disconnects as requested. */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - setverdict(pass); + f_shutdown_helper(); } function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, @@ -1797,7 +1802,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after Clear Command with CSFB indicator from MSC */ @@ -1820,7 +1825,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false, is_csfb := true); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after hard RLSD from MSC */ @@ -1835,7 +1840,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after hard RLSD from MSC and MS is not responding to RLL REL REQ */ @@ -1850,7 +1855,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after BSSMAP RESET from MSC */ @@ -1872,7 +1877,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Verify T(iar) triggers and releases the channel */ @@ -1889,7 +1894,7 @@ dt := f_est_dchan('23'O, 23, '00010203040506'O); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } private function f_tc_chan_rel_rr_cause(myBSSMAP_Cause clear_cmd_cause, template RR_Cause expect_rr_cause) @@ -1905,7 +1910,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false, expect_rr_cause := expect_rr_cause); - setverdict(pass); + f_shutdown_helper(); } /* Test that Clear Command cause codes affect the RR Channel Release cause code */ @@ -1940,7 +1945,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if RSL EST IND for invalid SAPI */ @@ -1965,7 +1970,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if RSL EST IND for invalid SAPI */ @@ -1989,7 +1994,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if RSL EST IND for invalid SACCH */ @@ -2013,7 +2018,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } private function f_exp_sapi_n_reject(template (present) GsmSapi sapi := ?, @@ -2070,7 +2075,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Check if we get SAPI N Reject on receipt of unexpected RLL ERROR INDication */ @@ -2098,7 +2103,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Check if we get SAPI N Reject due to a SAPI=3 link establishment timeout */ @@ -2124,12 +2129,13 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } testcase TC_si_default() runs on test_CT { f_init(0); f_init_bts_and_check_sysinfo(0, expect_si := SystemInformationConfig_default); + f_shutdown_helper(); } /* We're testing SI2quater with lists of EARFCNs. Instead of just incrementing EARFCNs, also pick some from the edges of @@ -2239,46 +2245,57 @@ testcase TC_si2quater_2_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(2); + f_shutdown_helper(); } testcase TC_si2quater_3_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(3); + f_shutdown_helper(); } testcase TC_si2quater_4_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(4); + f_shutdown_helper(); } testcase TC_si2quater_5_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(5); + f_shutdown_helper(); } testcase TC_si2quater_6_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(6); + f_shutdown_helper(); } testcase TC_si2quater_12_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(12); + f_shutdown_helper(); } testcase TC_si2quater_23_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(23); + f_shutdown_helper(); } testcase TC_si2quater_32_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(32); + f_shutdown_helper(); } testcase TC_si2quater_33_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(33); + f_shutdown_helper(); } testcase TC_si2quater_42_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(42); + f_shutdown_helper(); } testcase TC_si2quater_48_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(48); + f_shutdown_helper(); } /* verify the VTY error response when adding too many EARFCNs, and showing that osmo-bsc still sends 16 SI2quater with @@ -2312,6 +2329,7 @@ for (var integer i := 1; i < 48; i := i + 1) { f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i))}); } + f_shutdown_helper(); } private function f_acc09_count_allowed(AccessControlClass acc) return uint8_t @@ -2398,6 +2416,7 @@ f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10", "rach access-control-class 5 allowed"}); + f_shutdown_helper(); } /* verify ACC startup ramp+rotate feature */ @@ -2458,6 +2477,7 @@ f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10", "rach access-control-class 4 allowed", "no access-control-class-ramping"}); + f_shutdown_helper(); } testcase TC_ctrl_msc_connection_status() runs on test_CT { @@ -2467,7 +2487,7 @@ /* See https://osmocom.org/issues/2729 */ f_ctrl_get_exp(IPA_CTRL, "msc_connection_status", "connected"); - setverdict(pass); + f_shutdown_helper(); } testcase TC_ctrl_msc0_connection_status() runs on test_CT { @@ -2476,7 +2496,7 @@ f_init(1); f_ctrl_get_exp(IPA_CTRL, "msc.0.connection_status", "connected"); - setverdict(pass); + f_shutdown_helper(); } testcase TC_ctrl() runs on test_CT { @@ -2508,7 +2528,7 @@ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:attempted", 0); - setverdict(pass); + f_shutdown_helper(); } /* Verify that Upon receival of SET "location", BSC forwards a TRAP @@ -2534,7 +2554,7 @@ /* should match the one from config */ f_ctrl_set(SCCPLITE_IPA_CTRL, "rf_locked", "0"); - setverdict(pass); + f_shutdown_helper(); } @@ -2935,7 +2955,7 @@ } } - setverdict(pass); + f_shutdown_helper(); } /* Test RSL link drop causes counter increment */ @@ -2950,7 +2970,7 @@ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "rsl_fail", rsl_fail+1); - setverdict(pass); + f_shutdown_helper(); } /* TODO: Test OML link drop causes counter increment */ @@ -2996,6 +3016,7 @@ } else { setverdict(fail, "Timeout RSL waiting for connection to close"); } + f_shutdown_helper(); } @@ -3006,6 +3027,7 @@ } else { setverdict(fail, "Timeout OML waiting for connection to close"); } + f_shutdown_helper(); } @@ -3083,6 +3105,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_ciph_mode_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3093,6 +3116,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_ciph_mode_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3103,6 +3127,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); vc_conn.done; + f_shutdown_helper(); } /* establish initial channel, enable ciphering followed by assignment to ciphered channel */ @@ -3122,6 +3147,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_aoip_tla_v6), pars); vc_conn.done; + f_shutdown_helper(); } @@ -3144,6 +3170,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_fr_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3154,6 +3181,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_fr_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3164,6 +3192,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } /* Expect ASSIGNMENT FAIL if mandatory IE is missing */ @@ -3186,6 +3215,7 @@ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing)); vc_conn.done; + f_shutdown_helper(); } private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { @@ -3209,6 +3239,7 @@ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_4)); vc_conn.done; + f_shutdown_helper(); } @@ -3236,6 +3267,7 @@ vc_conn := f_start_handler(refers(f_tc_assignment_sign)); vc_conn.done; + f_shutdown_helper(); } /*********************************************************************** @@ -3446,6 +3478,7 @@ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_codec_hr() runs on test_CT { @@ -3458,6 +3491,7 @@ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_codec_efr() runs on test_CT { @@ -3470,6 +3504,7 @@ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecEFR})); vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } /* Allow 5,90k only (current default config) */ @@ -3527,6 +3562,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h() runs on test_CT { @@ -3551,6 +3587,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } function f_TC_assignment_codec_amr(boolean fr, octetstring mrconf, bitstring s8_s0, bitstring exp_s8_s0) @@ -3614,56 +3651,67 @@ * set. */ testcase TC_assignment_codec_amr_f_S1() runs on test_CT { f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); + f_shutdown_helper(); } /* Set S1, we expect an AMR multirate configuration IE with the lower three * rates set. */ testcase TC_assignment_codec_amr_h_S1() runs on test_CT { f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); + f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_f_S124() runs on test_CT { f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); + f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_h_S124() runs on test_CT { f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); + f_shutdown_helper(); } /* The following block of tests selects more and more rates until all four * possible rates are in the active set (full rate) */ testcase TC_assignment_codec_amr_f_S0() runs on test_CT { f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S02() runs on test_CT { f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S024() runs on test_CT { f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S0247() runs on test_CT { f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); + f_shutdown_helper(); } /* The following block of tests selects more and more rates until all three * possible rates are in the active set (half rate) */ testcase TC_assignment_codec_amr_h_S0() runs on test_CT { f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S02() runs on test_CT { f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S024() runs on test_CT { f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); + f_shutdown_helper(); } /* The following block tests what happens when the MSC does offer rate @@ -3676,6 +3724,7 @@ /* Try to include 12,2k in into the active set even though the channel * is half rate only. The BSC is expected to remove the 12,0k */ f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S01234567() runs on test_CT { @@ -3683,6 +3732,7 @@ * Also S1 is selected, this setting will be prefered and we should * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S0234567() runs on test_CT { @@ -3690,21 +3740,25 @@ * select the currently supported rates, which are also 12.2k, 7,40k, * 5,90k, and 4,75k, into the active set. */ f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_zero() runs on test_CT { /* Try to select no rates at all */ f_TC_assignment_codec_amr_fail(true, '00000000'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_unsupp() runs on test_CT { /* Try to select only unsupported rates */ f_TC_assignment_codec_amr_fail(true, '01101000'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S7() runs on test_CT { /* Try to select 12,2k for half rate */ f_TC_assignment_codec_amr_fail(false, '10000000'B); + f_shutdown_helper(); } private function f_disable_all_tch_f() runs on test_CT { @@ -3839,7 +3893,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR channel while all FR channels are exhausted, this is expected @@ -3853,7 +3907,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr_fail)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR (prefered) or alternatively a HR channel while all FR channels @@ -3867,7 +3921,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_fr_hr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a HR (prefered) or alternatively a FR channel while all FR channels @@ -3881,7 +3935,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_hr_fr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR channel while all HR channels are exhausted, this is expected @@ -3895,7 +3949,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a HR channel while all HR channels are exhausted, this is expected @@ -3909,7 +3963,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr_fail)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a HR (prefered) or alternatively a FR channel while all HR channels @@ -3923,7 +3977,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_hr_fr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR (prefered) or alternatively a HR channel while all HR channels @@ -3937,7 +3991,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_fr_hr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Allow FR and HR, but prefer HR */ @@ -3975,7 +4029,7 @@ f_enable_all_tch(); vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_hr_fr)); vc_conn.done; - setverdict(pass); + f_shutdown_helper(); } /* Request a FR (prefered) or alternatively a HR channel, it is expected that @@ -3987,7 +4041,7 @@ f_enable_all_tch(); vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_fr_hr)); vc_conn.done; - setverdict(pass); + f_shutdown_helper(); } testcase TC_assignment_osmux() runs on test_CT { @@ -4013,6 +4067,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } /* test the procedure of the MSC requesting a Classmark Update: @@ -4038,6 +4093,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_classmark)); vc_conn.done; + f_shutdown_helper(); } /* Send a CommonID from the simulated MSC and verify that the information is used to @@ -4065,6 +4121,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_common_id)); vc_conn.done; + f_shutdown_helper(); } private function f_est_single_l3(template PDU_ML3_MS_NW l3) runs on MSC_ConnHdlr { @@ -4103,6 +4160,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_unsol_ass_fail)); vc_conn.done; + f_shutdown_helper(); } @@ -4117,6 +4175,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_unsol_ass_compl)); vc_conn.done; + f_shutdown_helper(); } @@ -4131,6 +4190,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_unsol_ho_fail)); vc_conn.done; + f_shutdown_helper(); } @@ -4151,6 +4211,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_err_82_short_msg)); vc_conn.done; + f_shutdown_helper(); } @@ -4172,6 +4233,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_err_84_unknown_msg)); vc_conn.done; + f_shutdown_helper(); } /*********************************************************************** @@ -4284,6 +4346,7 @@ f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted"); f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:completed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ @@ -4393,6 +4456,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:completed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* BSC asks for inter-BSC HO, but the MSC decides that it won't happen and @@ -4450,6 +4514,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports @@ -4544,6 +4609,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:failed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* BSC asks for inter-BSC-out HO, receives BSSMAP Handover Command, but then no reply is received about HO outcome @@ -4641,6 +4707,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_into_this_bsc(charstring id) runs on MSC_ConnHdlr { @@ -4730,12 +4797,14 @@ testcase TC_ho_into_this_bsc() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); f_tc_ho_into_this_bsc_main(pars); + f_shutdown_helper(); } testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.host_aoip_tla := "::6"; f_tc_ho_into_this_bsc_main(pars); + f_shutdown_helper(); } private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr { @@ -4817,6 +4886,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:stopped"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_in_fail_msc_clears_after_ho_detect(charstring id) runs on MSC_ConnHdlr { @@ -4882,7 +4952,6 @@ BSSAP.send(ts_BSSMAP_ClearCommand(cause)); f_expect_dlcx_conns(); - setverdict(pass); f_sleep(1.0); } testcase TC_ho_in_fail_msc_clears_after_ho_detect() runs on test_CT { @@ -4905,6 +4974,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:stopped"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* The new BSS's lchan times out before the MSC decides that handover failed. */ @@ -4969,10 +5039,7 @@ BSSAP.send(ts_BSSMAP_ClearCommand(cause)); f_expect_dlcx_conns(); - setverdict(pass); f_sleep(1.0); - - setverdict(pass); } testcase TC_ho_in_fail_no_detect() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -4994,6 +5061,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* Same as f_tc_ho_in_fail_no_detect, but MSC fails to send a Clear Command */ @@ -5050,7 +5118,6 @@ BSSAP.send(ts_BSSMAP_ClearCommand(cause)); }; f_expect_dlcx_conns(); - setverdict(pass); f_sleep(1.0); } testcase TC_ho_in_fail_no_detect2() runs on test_CT { @@ -5073,6 +5140,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } type record of charstring Commands; @@ -5289,6 +5357,7 @@ f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_2(charstring id) runs on MSC_ConnHdlr { @@ -5338,6 +5407,7 @@ f_ctrs_bsc_and_bts_add(0, "handover:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_3(charstring id) runs on MSC_ConnHdlr { @@ -5386,6 +5456,7 @@ f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_4(charstring id) runs on MSC_ConnHdlr { @@ -5441,6 +5512,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_5(charstring id) runs on MSC_ConnHdlr { @@ -5482,6 +5554,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_6(charstring id) runs on MSC_ConnHdlr { @@ -5522,6 +5595,7 @@ f_ctrs_bsc_and_bts_add(0, "handover:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_7(charstring id) runs on MSC_ConnHdlr { @@ -5575,6 +5649,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* OS#3041: Open and close N connections in a normal fashion, and expect no @@ -5828,7 +5903,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } /* Test IPA PDCH activation NACK */ @@ -5865,7 +5940,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } @@ -5934,7 +6009,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } /* Test Osmocom dyn PDCH activation NACK behavior */ @@ -5963,7 +6038,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } testcase TC_chopped_ipa_ping() runs on test_CT { @@ -5971,6 +6046,7 @@ 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); } + f_shutdown_helper(); } testcase TC_chopped_ipa_payload() runs on test_CT { @@ -5979,6 +6055,7 @@ 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); } + f_shutdown_helper(); } /* Verify the BSC sends the MS Power Parameters IE during CHAN ACT to make sure @@ -5993,6 +6070,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } /*********************************************************************** @@ -6142,6 +6220,7 @@ vc_conn.done; f_ctrs_msc_expect(0, "mscpool:subscr:new", 4); + f_shutdown_helper(); } /* Three Layer 3 Complete by IMSI are round-robin'ed across two connected MSCs */ @@ -6182,6 +6261,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:new"); + f_shutdown_helper(); } /* Three LU by TMSI are round-robin'ed across two connected MSCs, because they contain the NULL-NRI 0 @@ -6223,6 +6303,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:reattach"); + f_shutdown_helper(); } /* Three LU by TMSI are round-robin'ed across two connected MSCs, because they contain the NULL-NRI 1 @@ -6265,6 +6346,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:reattach"); + f_shutdown_helper(); } /* Three Layer 3 Complete by TMSI are round-robin'ed across two connected MSCs, because they contain an NRI not @@ -6309,6 +6391,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:new"); + f_shutdown_helper(); } /* Three Layer 3 Complete by TMSI are round-robin'ed across two connected MSCs, because they contain an NRI @@ -6359,6 +6442,7 @@ f_ctrs_msc_add(2, "mscpool:subscr:attach_lost"); f_ctrs_msc_add(0, "mscpool:subscr:new"); f_ctrs_msc_verify(); + f_shutdown_helper(); } /* Three Layer 3 Complete by TMSI with valid NRI for the second MSC are all directed to the second MSC (configured in @@ -6402,6 +6486,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(1, "mscpool:subscr:known"); + f_shutdown_helper(); } /* Layer 3 Complete by TMSI with valid NRI for the third MSC are directed to the third MSC (configured in osmo-bsc.cfg), @@ -6445,6 +6530,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(1, "mscpool:subscr:new"); + f_shutdown_helper(); } /* LU with a TMSI but indicating a different PLMN in its previous LAI: ignore the NRI. */ @@ -6478,6 +6564,7 @@ vc_conn2 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars2); vc_conn2.done; f_ctrs_msc_expect(2, "mscpool:subscr:known"); + f_shutdown_helper(); } /* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by IMSI, which would be @@ -6507,7 +6594,6 @@ /* Despite the round robin pointing at the second MSC ('roundrobin next 1'), the earlier Paging for the same IMSI * causes this Paging Response to go to the first MSC (bssap_idx := 0). */ f_perform_compl_l3(RSL, ts_PAG_RESP(valueof(ts_MI_IMSI_LV(imsi))) ); - setverdict(pass); f_sleep(1.0); } testcase TC_mscpool_paging_and_response_imsi() runs on test_CT { @@ -6528,6 +6614,7 @@ vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_imsi), pars1); vc_conn1.done; f_ctrs_msc_expect(0, "mscpool:subscr:paged"); + f_shutdown_helper(); } /* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by TMSI with an NRI value @@ -6559,7 +6646,6 @@ * third MSC ('roundrobin next 2'), the earlier Paging for the same TMSI causes this Paging Response to go to * the first MSC (bssap_idx := 0). */ f_perform_compl_l3(RSL, ts_PAG_RESP(valueof(ts_MI_TMSI_NRI_LV(nri_v))) ); - setverdict(pass); f_sleep(1.0); } testcase TC_mscpool_paging_and_response_tmsi() runs on test_CT { @@ -6580,6 +6666,7 @@ vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_tmsi), pars1); vc_conn1.done; f_ctrs_msc_expect(0, "mscpool:subscr:paged"); + f_shutdown_helper(); } /* For round-robin, skip an MSC that has 'no allow-attach' set. */ @@ -6621,6 +6708,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:new"); + f_shutdown_helper(); } /* An MSC that has 'no allow-attach' set should still serve subscribers that are already attached according to their @@ -6664,6 +6752,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(2, "mscpool:subscr:new"); + f_shutdown_helper(); } /* Allow/Deny emergency calls globally via VTY */ @@ -6767,6 +6856,7 @@ f_vty_allow_emerg_bts(true, 0); vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_allow), pars); vc_conn.done; + f_shutdown_helper(); } /* EMERGENCY CALL situation #2, forbidden globally but allowed by BTS */ @@ -6781,6 +6871,7 @@ f_vty_allow_emerg_bts(true, 0); vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny), pars); vc_conn.done; + f_shutdown_helper(); } /* EMERGENCY CALL situation #3, allowed globally but forbidden by BTS */ @@ -6800,6 +6891,7 @@ f_vty_allow_emerg_bts(false, 0); vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny), pars); vc_conn.done; + f_shutdown_helper(); } /* Test what happens when an emergency call arrives while all TCH channels are @@ -6841,7 +6933,7 @@ f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 33)); rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); - setverdict(pass); + f_shutdown_helper(); } /* Hopping parameters per a timeslot */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c8a1061b546576b7a5c4b11f20dfc887aaab6e0 Gerrit-Change-Number: 20257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 14:00:57 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 14:00:57 +0000 Subject: Change in osmo-sip-connector[master]: forward full SDP between MNCC and SIP In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16222 ) Change subject: forward full SDP between MNCC and SIP ...................................................................... Patch Set 4: please note, I also keep a version of this patch on a branch in osmo-sip-connector.git that is being rebased onto master regularly, and might even have changes not shown here. Indeed there is still a TODO of integrating the functionality of stuff this patch version comments out. We do need those things to support re-INVITE, IIRC -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3df5d06f38ee2d122706a9ebffde7db4f2bd6bae Gerrit-Change-Number: 16222 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 23 Sep 2020 14:00:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 15:06:54 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 23 Sep 2020 15:06:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Check attempted/successful channel requests In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 ) Change subject: bsc: Check attempted/successful channel requests ...................................................................... bsc: Check attempted/successful channel requests Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Related: SYS#4877 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8934f42..0fd0a17 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3222,6 +3222,8 @@ f_establish_fully(ass_cmd, exp_compl); var StatsDExpects expect := { + { name := "TTCN3.bts.0.chreq.total", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.chreq.successful", mtype := "c", min := 1, max := 1}, { name := "TTCN3.bsc.0.assignment.attempted", mtype := "c", min := 1, max := 1}, { name := "TTCN3.bsc.0.assignment.completed", mtype := "c", min := 1, max := 1} }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5b5c7c72eea28314da2ee7725d94d85917aa3ad3 Gerrit-Change-Number: 20225 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 15:45:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 15:45:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: ACK on SIP failure message to avoid it being retransmitted References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 ) Change subject: sip: ACK on SIP failure message to avoid it being retransmitted ...................................................................... sip: ACK on SIP failure message to avoid it being retransmitted Otherwise the SIP message is retransmitted by osmo-sip-connector around 10-11 times, even when next test has started, making it fail since it's not expected. Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357 --- M sip/SIP_Tests.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/20258/1 diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 534801e..053395e 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -202,14 +202,23 @@ /* OSC <- SIP: A party sends SIP invite for a MT-call into OSC */ SIP.send(ts_SIP_INVITE(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, cp.comp.sip_seq_nr, cp.comp.sip_body)); - /* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */ - MNCC.receive(tr_MNCC_SETUP_req) -> value mncc { - cp.mncc_call_id := mncc.u.signal.callref; - } /* OSC -> SIP */ SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, "INVITE", 100, ?, "Trying", *)); + alt { + /* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */ + [] MNCC.receive(tr_MNCC_SETUP_req) -> value mncc { + cp.mncc_call_id := mncc.u.signal.callref; + } + [] SIP.receive { + setverdict(fail, "Received unexpected respose"); + SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, + cp.comp.sip_seq_nr, omit)); + mtc.stop; + } + } + /* MSC -> OSC: After MS sends CALL CONF in response to SETUP */ MNCC.send(ts_MNCC_CALL_CONF_ind(cp.mncc_call_id)); /* MSC <- OSC: OSC asks MSC to create RTP socket */ @@ -223,8 +232,16 @@ /* MSC -> OSC: After MS is ringing and sent CC ALERTING */ MNCC.send(ts_MNCC_ALERT_ind(cp.mncc_call_id)); SIP.clear; - SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, - "INVITE", 180, ?, "Ringing", *)); + alt { + [] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, + "INVITE", 180, ?, "Ringing", *)); + [] SIP.receive { + setverdict(fail, "Received unexpected respose"); + SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, + cp.comp.sip_seq_nr, omit)); + mtc.stop; + } + } /* MSC -> OSC: After MT user has picked up and sent CC CONNECT */ MNCC.send(ts_MNCC_SETUP_CNF(cp.mncc_call_id)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357 Gerrit-Change-Number: 20258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 16:18:58 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 16:18:58 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 ) Change subject: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c ...................................................................... add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df --- M include/osmocom/sigtran/sccp_helpers.h M src/sccp_helpers.c 2 files changed, 54 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/59/20259/1 diff --git a/include/osmocom/sigtran/sccp_helpers.h b/include/osmocom/sigtran/sccp_helpers.h index 3ef7740..831307d 100644 --- a/include/osmocom/sigtran/sccp_helpers.h +++ b/include/osmocom/sigtran/sccp_helpers.h @@ -54,5 +54,14 @@ char *osmo_sccp_gt_dump(const struct osmo_sccp_gt *gt); char *osmo_sccp_addr_dump(const struct osmo_sccp_addr *addr); + +int osmo_sccp_inst_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr); +char *osmo_sccp_inst_addr_to_str_c(void *ctx, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr); +int osmo_sccp_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr); +char *osmo_sccp_addr_to_str_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); + char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); char *osmo_sccp_inst_addr_name(const struct osmo_sccp_instance *sccp, const struct osmo_sccp_addr *addr); diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index c103376..fe1133f 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -311,34 +311,57 @@ return buf; } -/* Like osmo_sccp_addr_dump() but print human readable representations instead of raw values. */ +int osmo_sccp_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + char ipbuf[INET6_ADDRSTRLEN]; + + OSMO_STRBUF_PRINTF(sb, "RI=%s", osmo_sccp_routing_ind_name(addr->ri)); + + if (addr->presence & OSMO_SCCP_ADDR_T_PC) + OSMO_STRBUF_PRINTF(sb, ",PC=%s", osmo_ss7_pointcode_print(ss7, addr->pc)); + if (addr->presence & OSMO_SCCP_ADDR_T_SSN) + OSMO_STRBUF_PRINTF(sb, ",SSN=%s", osmo_sccp_ssn_name(addr->ssn)); + if (addr->presence & OSMO_SCCP_ADDR_T_IPv4) + OSMO_STRBUF_PRINTF(sb, ",IP=%s", inet_ntop(AF_INET, &addr->ip.v4, ipbuf, sizeof(ipbuf))); + else if (addr->presence & OSMO_SCCP_ADDR_T_IPv6) + OSMO_STRBUF_PRINTF(sb, ",IP=%s", inet_ntop(AF_INET6, &addr->ip.v6, ipbuf, sizeof(ipbuf))); + if (addr->gt.gti != OSMO_SCCP_GTI_NO_GT || addr->presence & OSMO_SCCP_ADDR_T_GT) + OSMO_STRBUF_PRINTF(sb, ",GTI=%s", osmo_sccp_gti_name(addr->gt.gti)); + if (addr->presence & OSMO_SCCP_ADDR_T_GT) + OSMO_STRBUF_PRINTF(sb, ",GT=(%s)", osmo_sccp_gt_dump(&addr->gt)); + + return sb.chars_needed; +} + +char *osmo_sccp_addr_to_str_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_addr_to_str_buf, ss7, addr) +} + +/* Rather use osmo_sccp_addr_to_str_buf() or osmo_sccp_addr_to_str_c() to not use a static buffer */ char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) { static char buf[256]; - bool comma = false; - char ipbuf[INET6_ADDRSTRLEN]; - - buf[0] = '\0'; - - append_to_buf(buf, sizeof(buf), &comma, "RI=%s", osmo_sccp_routing_ind_name(addr->ri)); - - if (addr->presence & OSMO_SCCP_ADDR_T_PC) - append_to_buf(buf, sizeof(buf), &comma, "PC=%s", osmo_ss7_pointcode_print(ss7, addr->pc)); - if (addr->presence & OSMO_SCCP_ADDR_T_SSN) - append_to_buf(buf, sizeof(buf), &comma, "SSN=%s", osmo_sccp_ssn_name(addr->ssn)); - if (addr->presence & OSMO_SCCP_ADDR_T_IPv4) - append_to_buf(buf, sizeof(buf), &comma, "IP=%s", inet_ntop(AF_INET, &addr->ip.v4, ipbuf, sizeof(ipbuf))); - else if (addr->presence & OSMO_SCCP_ADDR_T_IPv6) - append_to_buf(buf, sizeof(buf), &comma, "IP=%s", inet_ntop(AF_INET6, &addr->ip.v6, ipbuf, sizeof(ipbuf))); - if (addr->gt.gti != OSMO_SCCP_GTI_NO_GT || addr->presence & OSMO_SCCP_ADDR_T_GT) - append_to_buf(buf, sizeof(buf), &comma, "GTI=%s", osmo_sccp_gti_name(addr->gt.gti)); - if (addr->presence & OSMO_SCCP_ADDR_T_GT) - append_to_buf(buf, sizeof(buf), &comma, "GT=(%s)", osmo_sccp_gt_dump(&addr->gt)); - + osmo_sccp_addr_to_str_buf(buf, sizeof(buf), ss7, addr); return buf; } -/* Derive ss7 from the sccp instance and call osmo_sccp_addr_name() with that. +int osmo_sccp_inst_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr) +{ + return osmo_sccp_addr_to_str_buf(buf, buf_len, sccp? sccp->ss7 : NULL, addr); +} + +char *osmo_sccp_inst_addr_to_str_c(void *ctx, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_inst_addr_to_str_buf, sccp, addr); +} + +/* Rather use osmo_sccp_inst_addr_to_str_buf() or osmo_sccp_inst_addr_to_str_c() to not use a static buffer. + * Derive ss7 from the sccp instance and call osmo_sccp_addr_name() with that. * If sccp is passed as NULL, simply use the default point code format. */ char *osmo_sccp_inst_addr_name(const struct osmo_sccp_instance *sccp, const struct osmo_sccp_addr *addr) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df Gerrit-Change-Number: 20259 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 16:18:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 16:18:59 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... add osmo_sccp_addr_to_id_c() Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb --- M include/osmocom/sigtran/sccp_helpers.h M src/sccp_helpers.c 2 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/60/20260/1 diff --git a/include/osmocom/sigtran/sccp_helpers.h b/include/osmocom/sigtran/sccp_helpers.h index 831307d..dc4e115 100644 --- a/include/osmocom/sigtran/sccp_helpers.h +++ b/include/osmocom/sigtran/sccp_helpers.h @@ -63,5 +63,9 @@ const struct osmo_sccp_addr *addr); char *osmo_sccp_addr_to_str_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); +int osmo_sccp_addr_to_id_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr); +char *osmo_sccp_addr_to_id_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); + char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); char *osmo_sccp_inst_addr_name(const struct osmo_sccp_instance *sccp, const struct osmo_sccp_addr *addr); diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index fe1133f..70524a0 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -340,6 +340,44 @@ OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_addr_to_str_buf, ss7, addr) } +/*! like osmo_sccp_addr_to_str_buf, but using only characters passing osmo_identifier_valid(). Useful for FSM and CTRL + * IDs. + * + * The advantage over using osmo_sccp_addr_to_str_buf() followed by osmo_identifier_sanitize_buf() is that here, the + * address elements are separated by ':', while osmo_identifier_sanitize_buf() would replace all characters with the + * same, e.g. '-'. + */ +int osmo_sccp_addr_to_id_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + char ipbuf[INET6_ADDRSTRLEN]; + + OSMO_STRBUF_PRINTF(sb, "RI-%s", osmo_sccp_routing_ind_name(addr->ri)); + + if (addr->presence & OSMO_SCCP_ADDR_T_PC) + OSMO_STRBUF_PRINTF(sb, ":PC-%s", osmo_ss7_pointcode_print(ss7, addr->pc)); + if (addr->presence & OSMO_SCCP_ADDR_T_SSN) + OSMO_STRBUF_PRINTF(sb, ":SSN-%s", osmo_sccp_ssn_name(addr->ssn)); + if (addr->presence & OSMO_SCCP_ADDR_T_IPv4) + OSMO_STRBUF_PRINTF(sb, ":IP-%s", inet_ntop(AF_INET, &addr->ip.v4, ipbuf, sizeof(ipbuf))); + else if (addr->presence & OSMO_SCCP_ADDR_T_IPv6) + OSMO_STRBUF_PRINTF(sb, ":IP-%s", inet_ntop(AF_INET6, &addr->ip.v6, ipbuf, sizeof(ipbuf))); + if (addr->gt.gti != OSMO_SCCP_GTI_NO_GT || addr->presence & OSMO_SCCP_ADDR_T_GT) + OSMO_STRBUF_PRINTF(sb, ":GTI-%s", osmo_sccp_gti_name(addr->gt.gti)); + if (addr->presence & OSMO_SCCP_ADDR_T_GT) + OSMO_STRBUF_PRINTF(sb, ":GT-%s", osmo_sccp_gt_dump(&addr->gt)); + + /* inet_ntop() and osmo_sccp_gt_dump() may have written non-id chars. */ + osmo_identifier_sanitize_buf(buf, "", '-'); + return sb.chars_needed; +} + +char *osmo_sccp_addr_to_id_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_addr_to_id_buf, ss7, addr) +} + /* Rather use osmo_sccp_addr_to_str_buf() or osmo_sccp_addr_to_str_c() to not use a static buffer */ char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 16:45:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 16:45:53 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 ) Change subject: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/20259/1/src/sccp_helpers.c File src/sccp_helpers.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/20259/1/src/sccp_helpers.c at 323 PS1, Line 323: OSMO_STRBUF_PRINTF(sb, ",PC=%s", osmo_ss7_pointcode_print(ss7, addr->pc)); ss7=NULL is safe here? https://gerrit.osmocom.org/c/libosmo-sccp/+/20259/1/src/sccp_helpers.c at 363 PS1, Line 363: /* Rather use osmo_sccp_inst_addr_to_str_buf() or osmo_sccp_inst_addr_to_str_c() to not use a static buffer. Better but this below, not in first line where it's explained what the function does. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df Gerrit-Change-Number: 20259 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 16:45:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 16:58:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 16:58:12 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/20260/1/src/sccp_helpers.c File src/sccp_helpers.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/20260/1/src/sccp_helpers.c at 350 PS1, Line 350: int osmo_sccp_addr_to_id_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, what about generalizing osmo_sccp_addr_to_str_buf instead to have "," and "=" as char parameter? YOu most probably only need char_separator (','), the other ones are taken care of by osmo_identier_sanitize_buf. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 16:58:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 17:41:30 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 17:41:30 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 to look at the new patch set (#7). Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" Include the IMEI and the last seen time in an import from an osmo-nitb database. Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 --- M src/hlr_db_tool.c 1 file changed, 98 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/19914/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 17:42:28 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 17:42:28 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19914 ) Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 23 Sep 2020 17:42:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 17:47:23 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 23 Sep 2020 17:47:23 +0000 Subject: Change in osmo-hlr[master]: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" In-Reply-To: References: Message-ID: keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19914 ) Change subject: osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" ...................................................................... osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" Include the IMEI and the last seen time in an import from an osmo-nitb database. Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 --- M src/hlr_db_tool.c 1 file changed, 98 insertions(+), 5 deletions(-) Approvals: keith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c index 1212018..b2a26dc 100644 --- a/src/hlr_db_tool.c +++ b/src/hlr_db_tool.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -70,8 +71,9 @@ printf(" (All commands imply this if none exists yet.)\n"); printf("\n"); printf(" import-nitb-db Add OsmoNITB db's subscribers to OsmoHLR db.\n"); - printf(" Be aware that the import is lossy, only the\n"); - printf(" IMSI, MSISDN, nam_cs/ps and 2G auth data are set.\n"); + printf(" Be aware that the import is somewhat lossy, only the IMSI,\n"); + printf(" MSISDN, IMEI, nam_cs/ps, 2G auth data and last seen LU are set.\n"); + printf(" The most recently associated IMEI from the Equipment table is used.\n"); } static void print_version(int print_copyright) @@ -212,9 +214,15 @@ static const char *nitb_stmt_sql[] = { [NITB_SELECT_SUBSCR] = - "SELECT imsi, id, extension, authorized" - " FROM Subscriber" - " ORDER BY id", + "SELECT s.imsi, s.id, s.extension, s.authorized," + " SUBSTR(e.imei,0,15), STRFTIME('%s', s.expire_lu)" + " FROM Subscriber s LEFT JOIN" + " (SELECT imei, subscriber_id, MAX(Equipment.updated) AS updated" + " FROM Equipment,EquipmentWatch" + " WHERE Equipment.id = EquipmentWatch.equipment_id" + " GROUP BY EquipmentWatch.subscriber_id) e" + " ON e.subscriber_id = s.id" + " ORDER by s.id", [NITB_SELECT_AUTH_KEYS] = "SELECT algorithm_id, a3a8_ki from authkeys" " WHERE subscriber_id = $subscr_id", @@ -222,8 +230,65 @@ sqlite3_stmt *nitb_stmt[ARRAY_SIZE(nitb_stmt_sql)] = {}; +enum hlr_db_stmt { + HLR_DB_STMT_SET_IMPLICIT_LU_BY_IMSI, +}; + +static const char *hlr_db_stmt_sql[] = { + [HLR_DB_STMT_SET_IMPLICIT_LU_BY_IMSI] = + "UPDATE subscriber SET last_lu_seen = datetime($last_lu, 'unixepoch') WHERE imsi = $imsi", +}; + +sqlite3_stmt *hlr_db_stmt[ARRAY_SIZE(hlr_db_stmt_sql)] = {}; + size_t _dbd_decode_binary(const unsigned char *in, unsigned char *out); +/*! Set a subscriber's LU timestamp in the HLR database. + * In normal operations there is never any need to explicitly + * update the value of last_lu_seen, so this function can live here. + * + * \param[in,out] dbc database context. + * \param[in] imsi ASCII string of IMSI digits + * \param[in] imei ASCII string of identifier digits, or NULL to remove the IMEI. + * \returns 0 on success, -ENOENT when the given subscriber does not exist, + * -EIO on database errors. + */ +int db_subscr_update_lu_by_imsi(struct db_context *dbc, const char* imsi, const int last_lu) +{ + int rc, ret = 0; + + sqlite3_stmt *stmt = hlr_db_stmt[HLR_DB_STMT_SET_IMPLICIT_LU_BY_IMSI]; + + if (!db_bind_text(stmt, "$imsi", imsi)) + return -EIO; + if (last_lu && !db_bind_int(stmt, "$last_lu", last_lu)) + return -EIO; + + /* execute the statement */ + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) { + LOGP(DAUC, LOGL_ERROR, "Update last_lu_seen for subscriber IMSI='%s': SQL Error: %s\n", imsi, + sqlite3_errmsg(dbc->db)); + ret = -EIO; + goto out; + } + + /* verify execution result */ + rc = sqlite3_changes(dbc->db); + if (!rc) { + LOGP(DAUC, LOGL_ERROR, "Cannot update last_lu_seen for subscriber IMSI='%s': no such subscriber\n", imsi); + ret = -ENOENT; + } else if (rc != 1) { + LOGP(DAUC, LOGL_ERROR, "Update last_lu_seen for subscriber IMSI='%s': SQL modified %d rows (expected 1)\n", + imsi, rc); + ret = -EIO; + } + +out: + db_remove_reset(stmt); + return ret; +} + void import_nitb_subscr_aud(sqlite3 *nitb_db, const char *imsi, int64_t nitb_id, int64_t hlr_id) { int rc; @@ -297,6 +362,7 @@ int64_t imsi; char imsi_str[32]; bool authorized; + int last_lu_int; imsi = sqlite3_column_int64(stmt, 0); @@ -315,8 +381,18 @@ nitb_id = sqlite3_column_int64(stmt, 1); copy_sqlite3_text_to_buf(subscr.msisdn, stmt, 2); authorized = sqlite3_column_int(stmt, 3) ? true : false; + copy_sqlite3_text_to_buf(subscr.imei, stmt, 4); + /* Default periodic LU was 30 mins and the expire_lu + * was twice that + 1 min + */ + last_lu_int = sqlite3_column_int(stmt, 5) - 3660; db_subscr_update_msisdn_by_imsi(dbc, imsi_str, subscr.msisdn); + /* In case the subscriber was somehow never seen, invent an IMEI */ + if (strlen(subscr.imei) == 14) + db_subscr_update_imei_by_imsi(dbc, imsi_str, subscr.imei); + db_subscr_update_lu_by_imsi(dbc, imsi_str, last_lu_int); + db_subscr_nam(dbc, imsi_str, authorized, true); db_subscr_nam(dbc, imsi_str, authorized, false); @@ -361,6 +437,17 @@ } } + for (i = 0; i < ARRAY_SIZE(hlr_db_stmt_sql); i++) { + sql = hlr_db_stmt_sql[i]; + rc = sqlite3_prepare_v2(g_hlr_db_tool_ctx->dbc->db, hlr_db_stmt_sql[i], -1, + &hlr_db_stmt[i], NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "OsmoHLR DB: Unable to prepare SQL statement '%s'\n", sql); + ret = -1; + goto out_free; + } + } + stmt = nitb_stmt[NITB_SELECT_SUBSCR]; while ((rc = sqlite3_step(stmt)) == SQLITE_ROW) { @@ -387,6 +474,7 @@ { int rc; int (*main_action)(void); + int i; main_action = NULL; g_hlr_db_tool_ctx = talloc_zero(NULL, struct hlr_db_tool_ctx); @@ -430,6 +518,11 @@ if (main_action) rc = (*main_action)(); + /* db_close will only finalize statments in g_hlr_db_tool_ctx->dbc->stmt + * it is ok to call finalize on NULL */ + for (i = 0; i < ARRAY_SIZE(hlr_db_stmt); i++) { + sqlite3_finalize(hlr_db_stmt[i]); + } db_close(g_hlr_db_tool_ctx->dbc); log_fini(); exit(rc ? EXIT_FAILURE : EXIT_SUCCESS); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic47e549be3551ae43ab6a84228d47ae03e9652a6 Gerrit-Change-Number: 19914 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 18:43:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 18:43:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: wait until IPA handshake is done in f_connect_ipa References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20261 ) Change subject: stp: wait until IPA handshake is done in f_connect_ipa ...................................................................... stp: wait until IPA handshake is done in f_connect_ipa Otherwise when trying to send stuff to an IPA ASP in some test, it may fail because the ASP is till not active in the STP (because IPA handshake was yet not finished, race condition). Change-Id: I8ea11fe331baf2b65ce0b7b3c1a2b480332faa2a --- M stp/STP_Tests_IPA.ttcn 1 file changed, 16 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/20261/1 diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 26abc80..10367ad 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -56,6 +56,7 @@ /* for IPA we use the IPA_Emulation and not directly IPA_CodecPort to avoid * having to re-invent IPA CCM handling here */ port MTP3asp_PT IPA[NR_IPA]; + port IPA_SP_PT IPA_CTRL[NR_IPA]; var IPA_Emulation_CT vc_IPA[NR_IPA]; var IPA_CCM_Parameters g_ccm_pars[NR_IPA]; } @@ -103,12 +104,13 @@ vc_IPA[i] := IPA_Emulation_CT.create("IPA" & int2str(i)); map(vc_IPA[i]:IPA_PORT, system:IPA_CODEC_PT); connect(self:IPA[i], vc_IPA[i]:MTP3_SP_PORT); + connect(self:IPA_CTRL[i], vc_IPA[i]:IPA_SP_PORT); g_ccm_pars[i] := c_IPA_default_ccm_pars; g_ccm_pars[i].name := mp_ipa_as_names[i]; } } -friend function f_connect_ipa(integer idx, boolean use_unknown_asp_port := false) runs on IPA_CT { +friend function f_connect_ipa(integer idx, boolean use_unknown_asp_port := false, boolean exp_act := true) runs on IPA_CT { var integer port_offset := 0; if (use_unknown_asp_port) { /* Add 100 to the port since we know that port is not configured in any @@ -117,6 +119,12 @@ } vc_IPA[idx].start(IPA_Emulation.main_client(mp_stp_ipa_ip, mp_stp_ipa_port, mp_local_ipa_ip, mp_local_ipa_port + idx + port_offset, g_ccm_pars[idx])); + IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)); + alt { + [exp_act] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)); + [not exp_act] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN)); + [] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(?)) { repeat; } + } } @@ -126,16 +134,12 @@ f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"}, "accept-asp-connections pre-configured"); f_init_ipa(); - f_connect_ipa(0, true); - f_sleep(1.0); - if (IPA[0].checkstate("Connected")) { - setverdict(fail, "Expected IPA port to be disconnected"); - } else { - setverdict(pass); - } + f_connect_ipa(0, true, false); + /* switch back to default */ f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"}, "accept-asp-connections dynamic-permitted"); + setverdict(pass); } /* "accept-asp-connections pre-configured" and client from known source */ @@ -145,15 +149,11 @@ "accept-asp-connections pre-configured"); f_init_ipa(); f_connect_ipa(0, false); - f_sleep(1.0); - if (not IPA[0].checkstate("Connected")) { - setverdict(fail, "Expected IPA port to be connected"); - } else { - setverdict(pass); - } + /* switch back to default */ f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"}, "accept-asp-connections dynamic-permitted"); + setverdict(pass); } @@ -162,12 +162,7 @@ f_init_common(); f_init_ipa(); f_connect_ipa(0, true); - f_sleep(1.0); - if (not IPA[0].checkstate("Connected")) { - setverdict(fail, "Expected IPA port to be connected"); - } else { - setverdict(pass); - } + setverdict(pass); } private function f_tc_tmt_override(boolean unknwon_dynamic_asp) @@ -178,17 +173,16 @@ f_connect_ipa(4, unknwon_dynamic_asp); /* activate the first 'receiver' side ASP */ f_connect_ipa(5, unknwon_dynamic_asp); - f_sleep(1.0); /* verify traffic is routed from sender to [sole] receiver */ f_test_traffic(4, 5); /* activate the second 'receiver' side ASP */ f_connect_ipa(6, unknwon_dynamic_asp); - f_sleep(1.0); /* verify traffic is routed from sender to new receiver */ f_test_traffic(4, 6); + setverdict(pass); } /* test "traffic-mode override" behavior */ @@ -218,7 +212,6 @@ f_connect_ipa(0, unknwon_dynamic_asp); /* activate the first 'receiver' side ASP */ f_connect_ipa(1, unknwon_dynamic_asp); - f_sleep(1.0); /* verify traffic is routed from sender to [sole] receiver */ for (i := 0; i < 10; i := i+1) { @@ -227,7 +220,6 @@ /* activate the second 'receiver' side ASP */ f_connect_ipa(2, unknwon_dynamic_asp); - f_sleep(1.0); /* verify traffic is routed from sender to new receiver */ const integer iter_per_asp := 5; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8ea11fe331baf2b65ce0b7b3c1a2b480332faa2a Gerrit-Change-Number: 20261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 19:03:45 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 19:03:45 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 ) Change subject: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/20259/1/src/sccp_helpers.c File src/sccp_helpers.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/20259/1/src/sccp_helpers.c at 323 PS1, Line 323: OSMO_STRBUF_PRINTF(sb, ",PC=%s", osmo_ss7_pointcode_print(ss7, addr->pc)); > ss7=NULL is safe here? I only changed append_to_buf to OSMO_STRBUF_PRINTF, no idea really https://gerrit.osmocom.org/c/libosmo-sccp/+/20259/1/src/sccp_helpers.c at 363 PS1, Line 363: /* Rather use osmo_sccp_inst_addr_to_str_buf() or osmo_sccp_inst_addr_to_str_c() to not use a static buffer. > Better but this below, not in first line where it's explained what the function does. i thought it's better to see right away to rather look elsewhere. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df Gerrit-Change-Number: 20259 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 19:03:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 19:05:16 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 19:05:16 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/20260/1/src/sccp_helpers.c File src/sccp_helpers.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/20260/1/src/sccp_helpers.c at 350 PS1, Line 350: int osmo_sccp_addr_to_id_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, > what about generalizing osmo_sccp_addr_to_str_buf instead to have "," and "=" as char parameter? [?] hmm yeah, maybe as static func -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 19:05:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 19:12:25 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 19:12:25 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/20260/1/src/sccp_helpers.c File src/sccp_helpers.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/20260/1/src/sccp_helpers.c at 333 PS1, Line 333: OSMO_STRBUF_PRINTF(sb, ",GT=(%s)", osmo_sccp_gt_dump(&addr->gt)); except this one then becomes ':GT--xxx-' instead of ':GT-xxx' but whatever -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 19:12:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 19:14:06 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 23 Sep 2020 19:14:06 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 to look at the new patch set (#2). Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... add osmo_sccp_addr_to_id_c() Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb --- M include/osmocom/sigtran/sccp_helpers.h M src/sccp_helpers.c 2 files changed, 39 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/60/20260/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 21:39:15 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 21:39:15 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20262 ) Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... gb/gprs_bssgb: check if talloc failed on btsctx->fc Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe --- M src/gb/gprs_bssgp.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/20262/1 diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 9c119fb..8df0006 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -150,7 +150,14 @@ talloc_free(ctx); return NULL; } + ctx->fc = talloc_zero(ctx, struct bssgp_flow_control); + if (!ctx->fc) { + rate_ctr_group_free(ctx->ctrg); + talloc_free(ctx); + return NULL; + } + /* cofigure for 2Mbit, 30 packets in queue */ bssgp_fc_init(ctx->fc, 100000, 2*1024*1024/8, 30, &_bssgp_tx_dl_ud); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 21:39:16 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 21:39:16 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssg... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20263 ) Change subject: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc ...................................................................... gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc Change-Id: Id03ebef31bb513e2b3b5bc709a91e9352ebbbc79 --- M src/gb/gprs_bssgp.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/20263/1 diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 8df0006..0adaffc 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -170,6 +170,8 @@ { if (!ctx) return; + + osmo_timer_del(&ctx->fc->timer); rate_ctr_group_free(ctx->ctrg); llist_del(&ctx->list); talloc_free(ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id03ebef31bb513e2b3b5bc709a91e9352ebbbc79 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 21:39:17 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 21:39:17 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix return code of vtyvc_by_nsei References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20264 ) Change subject: ns2: vty: fix return code of vtyvc_by_nsei ...................................................................... ns2: vty: fix return code of vtyvc_by_nsei This prevented the parsing of persistent nsvcs. Change-Id: I297409f557f17df680ac76018b4202eb99713021 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/20264/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 81f88b6..302c610 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -151,7 +151,7 @@ vtyvc->nsei = nsei; } - return NULL; + return vtyvc; } static int config_write_ns(struct vty *vty) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 21:39:17 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 21:39:17 +0000 Subject: Change in libosmocore[master]: ns2: remove bssgp specific msgb->cb parts References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20265 ) Change subject: ns2: remove bssgp specific msgb->cb parts ...................................................................... ns2: remove bssgp specific msgb->cb parts There shouldn't be any knowledge of the upper layer in the NS layer. The PCU / SGSN / gbproxy have to add the pointer when parsing the primitives. Change-Id: Id7edb8feb96436ba170383fc62d43ceb16955d53 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/20265/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 33a0328..7b07a49 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -469,9 +469,9 @@ /* TODO: nsh->data[0] -> C/R only valid in IP SNS */ bvci = nsh->data[1] << 8 | nsh->data[2]; - msgb_bssgph(msg) = &nsh->data[3]; - msgb_bvci(msg) = nsp.bvci = bvci; - msgb_nsei(msg) = nsp.nsei = priv->nsvc->nse->nsei; + msg->l3h = &nsh->data[3]; + nsp.bvci = bvci; + nsp.nsei = priv->nsvc->nse->nsei; if (nsh->data[0]) nsp.u.unitdata.change = NS_ENDPOINT_REQUEST_CHANGE; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7edb8feb96436ba170383fc62d43ceb16955d53 Gerrit-Change-Number: 20265 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 21:39:17 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 21:39:17 +0000 Subject: Change in libosmocore[master]: ns2: check the specific bit of NS SDU Control bits References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20266 ) Change subject: ns2: check the specific bit of NS SDU Control bits ...................................................................... ns2: check the specific bit of NS SDU Control bits Change-Id: I9632abe70585cb7aff2602590453d903dd88b48a --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/20266/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 7b07a49..d13f1ce 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -473,7 +473,8 @@ nsp.bvci = bvci; nsp.nsei = priv->nsvc->nse->nsei; - if (nsh->data[0]) + /* 10.3.9 NS SDU Control Bits */ + if (nsh->data[0] & 0x1) nsp.u.unitdata.change = NS_ENDPOINT_REQUEST_CHANGE; osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9632abe70585cb7aff2602590453d903dd88b48a Gerrit-Change-Number: 20266 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 21:57:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 21:57:16 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... Patch Set 2: Code-Review+1 Fine, but I wonder whether these APIs are really needed in a library because they seem to be aimed at really specific uses (like FSM), so not sure if it's really worth it having that in the library. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 21:57:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:00:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 22:00:27 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20262 ) Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20262/1/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/20262/1/src/gb/gprs_bssgp.c at 156 PS1, Line 156: rate_ctr_group_free(ctx->ctrg); what about moving this one and the return above into goto at the end? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 22:00:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:02:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 22:02:05 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssg... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20263 ) Change subject: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20263/1/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/20263/1/src/gb/gprs_bssgp.c at 174 PS1, Line 174: osmo_timer_del(&ctx->fc->timer); timer is freed here and it can happen if no osmo_timer_fd_setup is done on it. Just saying in case it can be an issue. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id03ebef31bb513e2b3b5bc709a91e9352ebbbc79 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 22:02:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:04:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 22:04:48 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix return code of vtyvc_by_nsei In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20264 ) Change subject: ns2: vty: fix return code of vtyvc_by_nsei ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20264/1/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/20264/1/src/gb/gprs_ns2_vty.c at 154 PS1, Line 154: return vtyvc; THis can still return unassigned value if no entries in vtyc list and alloc_missing=false. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 22:04:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:06:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 22:06:59 +0000 Subject: Change in libosmocore[master]: ns2: remove bssgp specific msgb->cb parts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20265 ) Change subject: ns2: remove bssgp specific msgb->cb parts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7edb8feb96436ba170383fc62d43ceb16955d53 Gerrit-Change-Number: 20265 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 22:06:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:08:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 23 Sep 2020 22:08:42 +0000 Subject: Change in libosmocore[master]: ns2: check the specific bit of NS SDU Control bits In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20266 ) Change subject: ns2: check the specific bit of NS SDU Control bits ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9632abe70585cb7aff2602590453d903dd88b48a Gerrit-Change-Number: 20266 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 23 Sep 2020 22:08:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:55:44 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 22:55:44 +0000 Subject: Change in libosmocore[master]: ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20267 ) Change subject: ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 ...................................................................... ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 gprs_ns2_nsvc_by_sockaddr is doing the lookup within a NSE. gprs_ns2_nsvc_by_sockaddr2 is doing the lookup within a bind. Also drop the *result pointer in the argument and return the NS-VC pointer if found or NULL. Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2_udp.c 2 files changed, 8 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/20267/1 diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index 68484c1..991a7d9 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -131,10 +131,9 @@ struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind); int gprs_ns2_is_ip_bind(struct gprs_ns2_vc_bind *bind); int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp); -int gprs_ns2_find_vc_by_sockaddr( +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr2( struct gprs_ns2_vc_bind *bind, - struct osmo_sockaddr *saddr, - struct gprs_ns2_vc **result); + struct osmo_sockaddr *saddr); int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi, struct osmo_sockaddr *local, diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index bb421a7..40923b2 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -81,16 +81,12 @@ /*! Find a NS-VC by its remote socket address. * \param[in] bind in which to search * \param[in] saddr remote peer socket adddress to search - * \param[out] result pointer to result - * \returns 0 on success; 1 if no NS-VC was found; negative on error */ -int gprs_ns2_find_vc_by_sockaddr(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr, struct gprs_ns2_vc **result) + * \returns NS-VC matching sockaddr; NULL if none found */ +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr2(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr) { struct gprs_ns2_vc *nsvc; struct priv_vc *vcpriv; - if (!result) - return -EINVAL; - llist_for_each_entry(nsvc, &bind->nsvc, blist) { vcpriv = nsvc->priv; if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family) @@ -98,11 +94,10 @@ if (osmo_sockaddr_cmp(&vcpriv->remote, saddr)) continue; - *result = nsvc; - return 0; + return nsvc; } - return 1; + return NULL; } static inline int nsip_sendmsg(struct gprs_ns2_vc_bind *bind, @@ -194,8 +189,8 @@ return -EINVAL; /* check if a vc is available */ - rc = gprs_ns2_find_vc_by_sockaddr(bind, &saddr, &nsvc); - if (rc) { + nsvc = gprs_ns2_nsvc_by_sockaddr2(bind, &saddr); + if (!nsvc) { /* VC not found */ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:55:45 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 22:55:45 +0000 Subject: Change in libosmocore[master]: ns2: ns2_recv_vc: remove unsued parameter nsi References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20268 ) Change subject: ns2: ns2_recv_vc: remove unsued parameter nsi ...................................................................... ns2: ns2_recv_vc: remove unsued parameter nsi Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c 4 files changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/20268/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 57a08d1..45ae002 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -844,12 +844,10 @@ /*! Bottom-side entry-point for received NS PDU from the driver/bind - * \param[in] nsi NS instance * \param[in] nsvc NS-VC for which the message was received * \param msg the received message. Ownership is trasnferred, caller must not free it! * \return 0 on success; negative on error */ -int ns2_recv_vc(struct gprs_ns2_inst *nsi, - struct gprs_ns2_vc *nsvc, +int ns2_recv_vc(struct gprs_ns2_vc *nsvc, struct msgb *msg) { struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 715c41a..0903e46 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -446,7 +446,7 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: @@ -459,12 +459,12 @@ case GPRS_NS2_CS_CREATED: frgre_alloc_vc(bind, nsvc, &saddr, dlci); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; } } else { /* VC found */ - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); } out: msgb_free(msg); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 708eb59..15b0bc5 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -203,8 +203,7 @@ struct msgb **reject, struct gprs_ns2_vc **success); -int ns2_recv_vc(struct gprs_ns2_inst *nsi, - struct gprs_ns2_vc *nsvc, +int ns2_recv_vc(struct gprs_ns2_vc *nsvc, struct msgb *msg); struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 40923b2..db83413 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -195,7 +195,7 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: @@ -208,12 +208,12 @@ case GPRS_NS2_CS_CREATED: ns2_driver_alloc_vc(bind, nsvc, &saddr); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; } } else { /* VC found */ - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); } msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 Gerrit-Change-Number: 20268 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 22:55:46 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 22:55:46 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20269 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... ns2: refactor handle_nsip_read/handle_nsfrgre_read Change-Id: Ieb273371877dbc7e5b321c3b377e7142e43668d9 --- M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 2 files changed, 6 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/20269/1 diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 0903e46..e2e0b29 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -446,12 +446,11 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: rc = 0; - break; + goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ frgre_sendmsg(bind, reject, &saddr); @@ -459,13 +458,11 @@ case GPRS_NS2_CS_CREATED: frgre_alloc_vc(bind, nsvc, &saddr, dlci); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(nsvc, msg); break; } - } else { - /* VC found */ - rc = ns2_recv_vc(nsvc, msg); } + + rc = ns2_recv_vc(nsvc, msg); out: msgb_free(msg); diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index db83413..a029cac 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -195,12 +195,11 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: rc = 0; - break; + goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ nsip_sendmsg(bind, reject, &saddr); @@ -208,14 +207,12 @@ case GPRS_NS2_CS_CREATED: ns2_driver_alloc_vc(bind, nsvc, &saddr); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(nsvc, msg); break; } - } else { - /* VC found */ - rc = ns2_recv_vc(nsvc, msg); } + rc = ns2_recv_vc(nsvc, msg); +out: msgb_free(msg); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieb273371877dbc7e5b321c3b377e7142e43668d9 Gerrit-Change-Number: 20269 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 23:15:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 23:15:26 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20264 to look at the new patch set (#2). Change subject: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found ...................................................................... ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found Fixes the parsing of persistent nsvcs. Change-Id: I297409f557f17df680ac76018b4202eb99713021 --- M src/gb/gprs_ns2_vty.c 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/20264/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 23:15:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 23:15:26 +0000 Subject: Change in libosmocore[master]: ns2: ns2_recv_vc: remove unused parameter nsi In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20268 to look at the new patch set (#2). Change subject: ns2: ns2_recv_vc: remove unused parameter nsi ...................................................................... ns2: ns2_recv_vc: remove unused parameter nsi Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c 4 files changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/20268/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 Gerrit-Change-Number: 20268 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 23 23:15:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 Sep 2020 23:15:27 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20270 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... ns2: refactor handle_nsip_read/handle_nsfrgre_read Might be more readable. Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b --- M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 2 files changed, 6 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/20270/1 diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 0903e46..e2e0b29 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -446,12 +446,11 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: rc = 0; - break; + goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ frgre_sendmsg(bind, reject, &saddr); @@ -459,13 +458,11 @@ case GPRS_NS2_CS_CREATED: frgre_alloc_vc(bind, nsvc, &saddr, dlci); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(nsvc, msg); break; } - } else { - /* VC found */ - rc = ns2_recv_vc(nsvc, msg); } + + rc = ns2_recv_vc(nsvc, msg); out: msgb_free(msg); diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index db83413..a029cac 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -195,12 +195,11 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: rc = 0; - break; + goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ nsip_sendmsg(bind, reject, &saddr); @@ -208,14 +207,12 @@ case GPRS_NS2_CS_CREATED: ns2_driver_alloc_vc(bind, nsvc, &saddr); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(nsvc, msg); break; } - } else { - /* VC found */ - rc = ns2_recv_vc(nsvc, msg); } + rc = ns2_recv_vc(nsvc, msg); +out: msgb_free(msg); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b Gerrit-Change-Number: 20270 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Sep 24 01:39:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 24 Sep 2020 01:39:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f6bf8dfa830f_59802b1de2a0a61076806@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 164s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 164s] [COMPILING libboard/qmod/source/card_pres.c] [ 164s] [COMPILING libboard/qmod/source/wwan_led.c] [ 164s] [COMPILING libboard/qmod/source/i2c.c] [ 164s] [COMPILING libboard/qmod/source/board_qmod.c] [ 165s] [COMPILING apps/dfu/main.c] [ 165s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 165s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 165s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 165s] Memory region Used Size Region Size %age Used [ 165s] rom: 16588 B 16 KB 101.25% [ 165s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 165s] collect2: error: ld returned 1 exit status [ 165s] % [ 165s] make[2]: *** [Makefile:234: flash] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 165s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: error: make -j1 returned exit code 2 [ 165s] make: *** [debian/rules:16: build] Error 25 [ 165s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 165s] ### VM INTERACTION START ### [ 168s] [ 157.306109] sysrq: Power Off [ 168s] [ 157.310862] reboot: Power down [ 169s] ### VM INTERACTION END ### [ 169s] [ 169s] cloud120 failed "build simtrace2_0.7.0.63.39070.dsc" at Thu Sep 24 01:39:03 UTC 2020. [ 169s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Sep 24 02:47:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 02:47:56 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 to look at the new patch set (#2). Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 7 files changed, 81 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 03:16:41 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 03:16:41 +0000 Subject: Change in osmo-pcu[master]: Use the new NS2 lib References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20271 ) Change subject: Use the new NS2 lib ...................................................................... Use the new NS2 lib Depends: Id7edb8feb96436ba170383fc62d43ceb16955d53 (libosmocore) Change-Id: Ib389925cf5c9f18951af6242c31ea70476218e9a --- M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_bssgp_pcu.h M src/osmobts_sock.cpp M src/pcu_l1_if.cpp M src/pcu_main.cpp M src/pcu_vty.c M tests/emu/pcu_emu.cpp M tests/tbf/TbfTest.cpp 9 files changed, 249 insertions(+), 188 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/71/20271/1 diff --git a/src/bts.h b/src/bts.h index 5a1b162..e930463 100644 --- a/src/bts.h +++ b/src/bts.h @@ -174,6 +174,11 @@ * more than one message, because they get sent so rarely. */ struct msgb *app_info; uint32_t app_info_pending; /* Count of MS with active TBF, to which we did not send app_info yet */ + + struct gprs_ns2_inst *nsi; + /* main nsei */ + struct gprs_ns2_nse *nse; + uint16_t nsei; }; enum { diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index d008d02..8383afd 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -30,6 +30,7 @@ extern "C" { #include + #include #include #include "coding_scheme.h" } @@ -51,7 +52,6 @@ extern bool spoof_mnc_3_digits; static void bvc_timeout(void *_priv); -static int gprs_ns_reconnect(struct gprs_nsvc *nsvc); static int parse_ra_cap(struct tlv_parsed *tp, MS_Radio_Access_capability_t *rac) { @@ -549,75 +549,91 @@ return 0; } -int gprs_bssgp_ns_cb(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, struct msgb *msg, uint16_t bvci) +void gprs_ns_prim_status_cb(struct osmo_gprs_ns2_prim *nsp) { - int rc = 0; - switch (event) { - case GPRS_NS_EVT_UNIT_DATA: - /* hand the message into the BSSGP implementation */ - rc = gprs_bssgp_pcu_rcvmsg(msg); + switch (nsp->u.status.cause) { + case NS_AFF_CAUSE_SNS_CONFIGURED: + LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d SNS configured.\n", nsp->nsei); break; - default: - LOGP(DPCU, LOGL_NOTICE, "RLCMAC: Unknown event %u from NS\n", event); - rc = -EIO; - break; - } - return rc; -} - - -static int nsvc_signal_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - struct ns_signal_data *nssd; - - if (subsys != SS_L_NS) - return -EINVAL; - - nssd = (struct ns_signal_data *)signal_data; - if (signal != S_SNS_CONFIGURED && nssd->nsvc != the_pcu.nsvc) { - LOGP(DPCU, LOGL_ERROR, "Signal received of unknown NSVC\n"); - return -EINVAL; - } - - switch (signal) { - case S_SNS_CONFIGURED: - the_pcu.bvc_sig_reset = 0; - the_pcu.bvc_reset = 0; - /* There's no NS-RESET / NS-UNBLOCK procedure on IP SNS based NS-VCs */ - the_pcu.nsvc_unblocked = 1; - LOGP(DPCU, LOGL_NOTICE, "NS-VC %d is unblocked.\n", the_pcu.nsvc->nsvci); - bvc_timeout(NULL); - break; - case S_NS_UNBLOCK: + case NS_AFF_CAUSE_RECOVERY: + LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei); if (!the_pcu.nsvc_unblocked) { - the_pcu.nsvc_unblocked = 1; - LOGP(DPCU, LOGL_NOTICE, "NS-VC %d is unblocked.\n", - the_pcu.nsvc->nsvci); the_pcu.bvc_sig_reset = 0; the_pcu.bvc_reset = 0; - the_pcu.bvc_unblocked = 0; + the_pcu.nsvc_unblocked = 1; bvc_timeout(NULL); } break; - case S_NS_BLOCK: + case NS_AFF_CAUSE_FAILURE: + LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became unavailable\n", nsp->nsei); if (the_pcu.nsvc_unblocked) { the_pcu.nsvc_unblocked = 0; osmo_timer_del(&the_pcu.bvc_timer); the_pcu.bvc_sig_reset = 0; the_pcu.bvc_reset = 0; the_pcu.bvc_unblocked = 0; - LOGP(DPCU, LOGL_NOTICE, "NS-VC is blocked.\n"); } break; - case S_NS_ALIVE_EXP: - LOGP(DPCU, LOGL_NOTICE, "Tns alive expired too often, " - "re-starting RESET procedure\n"); - gprs_ns_reconnect(nssd->nsvc); + default: + LOGP(DPCU, LOGL_NOTICE, + "NS: %s Unknown prim %d from NS\n", + get_value_string(osmo_prim_op_names, nsp->oph.operation), + nsp->oph.primitive); + break; + } +} + +/* called by the ns layer */ +int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx) +{ + struct osmo_gprs_ns2_prim *nsp; + int rc = 0; + + if (oph->sap != SAP_NS) + return 0; + + nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph); + + if (oph->operation != PRIM_OP_INDICATION) { + LOGP(DPCU, LOGL_NOTICE, "NS: %s Unknown prim %d from NS\n", + get_value_string(osmo_prim_op_names, oph->operation), + oph->operation); + return 0; + } + + switch (oph->primitive) { + case PRIM_NS_UNIT_DATA: + /* hand the message into the BSSGP implementation */ + /* add required msg fields for Gb layer */ + msgb_bssgph(oph->msg) = oph->msg->l3h; + msgb_bvci(oph->msg) = nsp->bvci; + msgb_nsei(oph->msg) = nsp->nsei; + rc = gprs_bssgp_pcu_rcvmsg(oph->msg); + break; + case PRIM_NS_STATUS: + gprs_ns_prim_status_cb(nsp); + break; + default: + LOGP(DPCU, LOGL_NOTICE, + "NS: %s Unknown prim %d from NS\n", + get_value_string(osmo_prim_op_names, oph->operation), + oph->primitive); break; } - return 0; + return rc; +} + +/* called by the bssgp layer to send NS PDUs */ +int gprs_bssgp_send_cb(void *ctx, struct msgb *msg) +{ + struct gprs_ns2_inst *nsi = (struct gprs_ns2_inst *) ctx; + struct osmo_gprs_ns2_prim nsp = {}; + nsp.nsei = msgb_nsei(msg); + nsp.bvci = msgb_bvci(msg); + osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA, + PRIM_OP_REQUEST, msg); + return gprs_ns2_recv_prim(nsi, &nsp.oph); } static unsigned count_pdch(const struct gprs_rlcmac_bts *bts) @@ -904,77 +920,65 @@ osmo_timer_schedule(&the_pcu.bvc_timer, the_pcu.bts->fc_interval, 0); } -static int gprs_ns_reconnect(struct gprs_nsvc *nsvc) -{ - struct gprs_nsvc *nsvc2; - if (nsvc != the_pcu.nsvc) { - LOGP(DBSSGP, LOGL_ERROR, "NSVC is invalid\n"); - return -EBADF; +int gprs_nsvc_create_and_connect( + struct gprs_rlcmac_bts *bts, + struct osmo_sockaddr *local, struct osmo_sockaddr *sgsn, + uint16_t nsei, uint16_t nsvci) +{ + struct gprs_ns2_vc *nsvc; + struct gprs_ns2_vc_bind *bind; + int rc; + + rc = gprs_ns2_ip_bind(bts->nsi, local, 0, &bind); + if (rc < 0) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to create socket\n"); + gprs_ns2_free(bts->nsi); + return 1; } - if (the_pcu.bts->gb_dialect_sns) - nsvc2 = gprs_ns_nsip_connect_sns(bssgp_nsi, &nsvc->ip.bts_addr, nsvc->nsei, nsvc->nsvci); - else - nsvc2 = gprs_ns_nsip_connect(bssgp_nsi, &nsvc->ip.bts_addr, nsvc->nsei, nsvc->nsvci); - if (!nsvc2) { - LOGP(DBSSGP, LOGL_ERROR, "Failed to reconnect NSVC\n"); - return -EIO; + bts->nse = gprs_ns2_nse_by_nsei(bts->nsi, nsei); + if (!bts->nse) + bts->nse = gprs_ns2_create_nse(bts->nsi, nsei); + + if (!bts->nse) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n"); + return 1; + } + + bts->nsei = nsei; + if (bts->gb_dialect_sns) { + rc = gprs_ns2_ip_connect_sns(bind, sgsn, nsei); + } else { + nsvc = gprs_ns2_ip_connect2(bind, sgsn, nsei, nsvci); + if (!nsvc) + rc = -1; + } + + if (rc) { + /* TODO: Could not connect */ + return 1; } return 0; } -/* create BSSGP/NS layer instances */ -struct gprs_bssgp_pcu *gprs_bssgp_create_and_connect(struct gprs_rlcmac_bts *bts, - uint16_t local_port, uint32_t sgsn_ip, - uint16_t sgsn_port, uint16_t nsei, uint16_t nsvci, uint16_t bvci, - uint16_t mcc, uint16_t mnc, bool mnc_3_digits, uint16_t lac, uint16_t rac, - uint16_t cell_id) +struct gprs_bssgp_pcu *gprs_bssgp_init( + struct gprs_rlcmac_bts *bts, + uint16_t nsei, uint16_t bvci, + uint16_t mcc, uint16_t mnc, bool mnc_3_digits, + uint16_t lac, uint16_t rac, uint16_t cell_id) { - struct sockaddr_in dest; - int rc; /* if already created... return the current address */ if (the_pcu.bctx) return &the_pcu; the_pcu.bts = bts; - - /* don't specify remote IP/port if SNS dialect is in use; Doing so would - * issue a connect() on the socket, which prevents us to dynamically communicate - * with any number of IP-SNS endpoints on the SGSN side */ - if (!bts->gb_dialect_sns) { - bssgp_nsi->nsip.remote_port = sgsn_port; - bssgp_nsi->nsip.remote_ip = sgsn_ip; - } - bssgp_nsi->nsip.local_port = local_port; - rc = gprs_ns_nsip_listen(bssgp_nsi); - if (rc < 0) { - LOGP(DBSSGP, LOGL_ERROR, "Failed to create socket\n"); - gprs_ns_close(bssgp_nsi); - return NULL; - } - - dest.sin_family = AF_INET; - dest.sin_port = htons(sgsn_port); - dest.sin_addr.s_addr = htonl(sgsn_ip); - - if (bts->gb_dialect_sns) - the_pcu.nsvc = gprs_ns_nsip_connect_sns(bssgp_nsi, &dest, nsei, nsvci); - else - the_pcu.nsvc = gprs_ns_nsip_connect(bssgp_nsi, &dest, nsei, nsvci); - if (!the_pcu.nsvc) { - LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSVCt\n"); - gprs_ns_close(bssgp_nsi); - return NULL; - } - the_pcu.bctx = btsctx_alloc(bvci, nsei); if (!the_pcu.bctx) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create BSSGP context\n"); - the_pcu.nsvc = NULL; - gprs_ns_close(bssgp_nsi); + the_pcu.bts->nse = NULL; return NULL; } the_pcu.bctx->ra_id.mcc = spoof_mcc ? : mcc; @@ -989,37 +993,27 @@ the_pcu.bctx->ra_id.rac = rac; the_pcu.bctx->cell_id = cell_id; - osmo_signal_register_handler(SS_L_NS, nsvc_signal_cb, NULL); - - osmo_timer_setup(&the_pcu.bvc_timer, bvc_timeout, NULL); + osmo_timer_setup(&the_pcu.bvc_timer, bvc_timeout, bts); return &the_pcu; } -void gprs_bssgp_destroy(void) +void gprs_bssgp_destroy(struct gprs_rlcmac_bts *bts) { - struct gprs_ns_inst *nsi = bssgp_nsi; - if (!nsi) - return; - - bssgp_nsi = NULL; - osmo_timer_del(&the_pcu.bvc_timer); - osmo_signal_unregister_handler(SS_L_NS, nsvc_signal_cb, NULL); - - the_pcu.nsvc = NULL; - /* FIXME: blocking... */ the_pcu.nsvc_unblocked = 0; the_pcu.bvc_sig_reset = 0; the_pcu.bvc_reset = 0; the_pcu.bvc_unblocked = 0; - gprs_ns_destroy(nsi); - bssgp_bvc_ctx_free(the_pcu.bctx); the_pcu.bctx = NULL; + + gprs_ns2_free(bts->nsi); + bts->nsi = NULL; + bts->nse = NULL; } struct bssgp_bvc_ctx *gprs_bssgp_pcu_current_bctx(void) diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h index 2ceef60..6341161 100644 --- a/src/gprs_bssgp_pcu.h +++ b/src/gprs_bssgp_pcu.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -45,7 +45,6 @@ #define IE_LLC_PDU 14 struct gprs_bssgp_pcu { - struct gprs_nsvc *nsvc; struct bssgp_bvc_ctx *bctx; struct gprs_rlcmac_bts *bts; @@ -76,16 +75,21 @@ struct tlv_parsed *tp); }; -struct gprs_bssgp_pcu *gprs_bssgp_create_and_connect(struct gprs_rlcmac_bts *bts, - uint16_t local_port, - uint32_t sgsn_ip, uint16_t sgsn_port, uint16_t nsei, - uint16_t nsvci, uint16_t bvci, uint16_t mcc, uint16_t mnc, bool mnc_3_digits, +struct gprs_bssgp_pcu *gprs_bssgp_init( + struct gprs_rlcmac_bts *bts, + uint16_t nsei, uint16_t bvci, + uint16_t mcc, uint16_t mnc, bool mnc_3_digits, uint16_t lac, uint16_t rac, uint16_t cell_id); -int gprs_bssgp_ns_cb(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, - struct msgb *msg, uint16_t bvci); +int gprs_nsvc_create_and_connect( + struct gprs_rlcmac_bts *bts, + struct osmo_sockaddr *local, struct osmo_sockaddr *sgsn, + uint16_t nsei, uint16_t nsvci); -void gprs_bssgp_destroy(void); +int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx); +int gprs_bssgp_send_cb(void *ctx, struct msgb *msg); + +void gprs_bssgp_destroy(struct gprs_rlcmac_bts *bts); struct bssgp_bvc_ctx *gprs_bssgp_pcu_current_bctx(void); diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index 8d3d26f..c9beff0 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -121,7 +121,7 @@ gprs_rlcmac_tbf::free_all(&bts->trx[trx]); } - gprs_bssgp_destroy(); + gprs_bssgp_destroy(bts); exit(0); } diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 535fb70..b58e2ff 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -491,8 +492,9 @@ { struct gprs_rlcmac_bts *bts = bts_main_data(); struct gprs_bssgp_pcu *pcu; - struct in_addr ia; + struct osmo_sockaddr local_sockaddr = {}, remote_sockaddr = {}; int rc = 0; + int good_nsvc = 0; unsigned int trx_nr, ts_nr; int i; @@ -517,7 +519,7 @@ for (ts_nr = 0; ts_nr < ARRAY_SIZE(bts->trx[0].pdch); ts_nr++) bts->trx[trx_nr].pdch[ts_nr].free_resources(); } - gprs_bssgp_destroy(); + gprs_bssgp_destroy(bts); exit(0); } LOGP(DL1IF, LOGL_INFO, "BTS available\n"); @@ -566,30 +568,65 @@ } LOGP(DL1IF, LOGL_DEBUG, " initial_cs=%d\n", info_ind->initial_cs); LOGP(DL1IF, LOGL_DEBUG, " initial_mcs=%d\n", info_ind->initial_mcs); - LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]); - LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]); - LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]); - ia.s_addr = info_ind->remote_ip[0].v4.s_addr; - LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia)); - switch (info_ind->address_type[0]) { - case PCU_IF_ADDR_TYPE_IPV4: - break; - case PCU_IF_ADDR_TYPE_IPV6: - LOGP(DL1IF, LOGL_ERROR, "This PCU does not support IPv6 NSVC!\n"); - goto bssgp_failed; - default: - LOGP(DL1IF, LOGL_ERROR, "No IPv4 NSVC given!\n"); + pcu = gprs_bssgp_init( + bts, + info_ind->nsei, info_ind->bvci, + info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, + info_ind->lac, info_ind->rac, info_ind->cell_id); + if (!pcu) { + LOGP(DL1IF, LOGL_NOTICE, "Failed to init BSSGP\n"); goto bssgp_failed; } - pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0], - ntohl(info_ind->remote_ip[0].v4.s_addr), info_ind->remote_port[0], - info_ind->nsei, info_ind->nsvci[0], info_ind->bvci, - info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac, - info_ind->cell_id); - if (!pcu) { - LOGP(DL1IF, LOGL_NOTICE, "SGSN is not available\n"); + for (int i=0; i<2; i++) { + struct osmo_sockaddr_str sockstr; + + switch (info_ind->address_type[i]) { + case IPPROTO_IPIP: + local_sockaddr.u.sin.sin_family = AF_INET; + local_sockaddr.u.sin.sin_addr.s_addr = INADDR_ANY; + local_sockaddr.u.sin.sin_port = htons(info_ind->local_port[i]); + + remote_sockaddr.u.sin.sin_family = AF_INET; + remote_sockaddr.u.sin.sin_addr = info_ind->remote_ip[i].v4; + remote_sockaddr.u.sin.sin_port = htons(info_ind->remote_port[i]); + break; + case IPPROTO_IPV6: + local_sockaddr.u.sin6.sin6_family = AF_INET6; + local_sockaddr.u.sin6.sin6_addr = in6addr_any; + local_sockaddr.u.sin6.sin6_port = htons(info_ind->local_port[i]); + + remote_sockaddr.u.sin6.sin6_family = AF_INET6; + remote_sockaddr.u.sin6.sin6_addr = info_ind->remote_ip[i].v6; + remote_sockaddr.u.sin6.sin6_port = htons(info_ind->remote_port[i]); + break; + default: + continue; + } + + LOGP(DL1IF, LOGL_DEBUG, " NS%d nsvci=%d\n", i, info_ind->nsvci[i]); + LOGP(DL1IF, LOGL_DEBUG, " NS%d local_port=%d\n", i, info_ind->local_port[i]); + LOGP(DL1IF, LOGL_DEBUG, " NS%d remote_port=%d\n", i, info_ind->remote_port[i]); + + if (osmo_sockaddr_str_from_sockaddr(&sockstr, &remote_sockaddr.u.sas)) + strcpy(sockstr.ip, "invalid"); + + LOGP(DL1IF, LOGL_DEBUG, " NS%d remote_ip=%s\n", i, sockstr.ip); + rc = gprs_nsvc_create_and_connect(bts, + &local_sockaddr, &remote_sockaddr, + info_ind->nsei, info_ind->nsvci[i]); + if (rc) { + LOGP(DL1IF, LOGL_ERROR, "Failed to create NSVC connection to %s:%d!\n", + sockstr.ip, sockstr.port); + continue; + } + + good_nsvc++; + } + + if (good_nsvc == 0) { + LOGP(DL1IF, LOGL_ERROR, "No NSVC available to connect to the SGSN!\n"); goto bssgp_failed; } diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index c5ff3dc..6616e11 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -38,7 +38,7 @@ #include "pcu_vty.h" #include "coding_scheme.h" #include -#include +#include #include #include #include @@ -267,7 +267,6 @@ osmo_stats_init(tall_pcu_ctx); rate_ctr_init(tall_pcu_ctx); - gprs_ns_set_log_ss(DNS); bssgp_set_log_ss(DBSSGP); pcu_vty_info.tall_ctx = tall_pcu_ctx; @@ -289,12 +288,13 @@ else fprintf(stderr, "Failed to initialize GSMTAP for %s\n", gsmtap_addr); - bssgp_nsi = gprs_ns_instantiate(&gprs_bssgp_ns_cb, tall_pcu_ctx); - if (!bssgp_nsi) { + bts->nsi = gprs_ns2_instantiate(tall_pcu_ctx, gprs_ns_prim_cb, NULL); + if (!bts->nsi) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n"); exit(1); } - gprs_ns_vty_init(bssgp_nsi); + bssgp_set_bssgp_callback(gprs_bssgp_send_cb, bts->nsi); + gprs_ns2_vty_init(bts->nsi); rc = vty_read_config_file(config_file, NULL); if (rc < 0 && config_given) { @@ -306,6 +306,8 @@ fprintf(stderr, "No config file: '%s' Using default config.\n", config_file); + gprs_ns2_vty_create(); + rc = telnet_init_dynif(tall_pcu_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_PCU); if (rc < 0) { diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 0756136..010f98d 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "pcu_vty.h" #include "gprs_rlcmac.h" #include @@ -1096,10 +1097,13 @@ { struct gprs_rlcmac_bts *bts = bts_main_data(); - if (!strcmp(argv[0], "ip-sns")) + if (!strcmp(argv[0], "ip-sns")) { bts->gb_dialect_sns = true; - else + gprs_ns2_vty_force_vc_mode(true, NS2_VC_MODE_ALIVE, "gb-dialect is ip-sns"); + } else { bts->gb_dialect_sns = false; + gprs_ns2_vty_force_vc_mode(false, 0, NULL); + } return CMD_SUCCESS; } diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index 7f99355..9c3a212 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -93,15 +93,28 @@ uint32_t sgsn_ip, uint16_t sgsn_port) { struct gprs_bssgp_pcu *pcu; + struct osmo_sockaddr local, remote; - pcu = gprs_bssgp_create_and_connect(bts, 0, sgsn_ip, sgsn_port, - 20, 20, 20, 901, 99, false, 1, 0, 0); + local.u.sin.sin_family = AF_INET; + local.u.sin.sin_addr.s_addr = 0; + local.u.sin.sin_port = 0; + + remote.u.sin.sin_family = AF_INET; + remote.u.sin.sin_addr.s_addr = htonl(sgsn_ip); + remote.u.sin.sin_port = htons(sgsn_port); + + pcu = gprs_bssgp_init(bts, 20, 20, 901, 99, false, 1, 0, 0); + gprs_nsvc_create_and_connect(bts, &local, &remote, + 20, 20); + pcu->on_unblock_ack = bvci_unblocked; pcu->on_dl_unit_data = bssgp_data; } int main(int argc, char **argv) { + struct gprs_rlcmac_bts *bts = bts_main_data(); + tall_pcu_ctx = talloc_named_const(NULL, 1, "moiji-mobile Emu-PCU context"); if (!tall_pcu_ctx) abort(); @@ -109,8 +122,8 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); - bssgp_nsi = gprs_ns_instantiate(&gprs_bssgp_ns_cb, tall_pcu_ctx); - if (!bssgp_nsi) { + bts->nsi = gprs_ns2_instantiate(tall_pcu_ctx, &gprs_ns_prim_cb, NULL); + if (!bts->nsi) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n"); abort(); } @@ -121,7 +134,8 @@ current_test = 0; init_main_bts(); - create_and_connect_bssgp(bts_main_data(), INADDR_LOOPBACK, 23000); + bssgp_set_bssgp_callback(gprs_bssgp_send_cb, bts->nsi); + create_and_connect_bssgp(bts, INADDR_LOOPBACK, 23000); for (;;) osmo_select_main(0); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index b16c089..15a79d0 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -470,15 +470,15 @@ fprintf(stderr, "=== start %s ===\n", __func__); - bssgp_nsi = gprs_ns_instantiate(&gprs_bssgp_ns_cb, tall_pcu_ctx); - if (!bssgp_nsi) { + bts = the_bts.bts_data(); + bts->nsi = gprs_ns2_instantiate(tall_pcu_ctx, gprs_ns_prim_cb, NULL); + if (!bts->nsi) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n"); abort(); } - bts = the_bts.bts_data(); setup_bts(&the_bts, ts_no); - gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 1234, 1234, 1234, 1, 1, false, 0, 0, 0); + gprs_bssgp_init(bts, 1234, 1234, 1, 1, false, 0, 0, 0); for (i = 0; i < 1024; i++) { uint32_t tlli = 0xc0000000 + i; @@ -497,7 +497,7 @@ OSMO_ASSERT(rc == -EBUSY); fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(); + gprs_bssgp_destroy(bts); } static void test_tbf_dl_llc_loss() @@ -514,20 +514,20 @@ uint8_t buf[19]; - bssgp_nsi = gprs_ns_instantiate(&gprs_bssgp_ns_cb, tall_pcu_ctx); - if (!bssgp_nsi) { + bts = the_bts.bts_data(); + bts->nsi = gprs_ns2_instantiate(tall_pcu_ctx, gprs_ns_prim_cb, NULL); + if (!bts->nsi) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n"); abort(); } fprintf(stderr, "=== start %s ===\n", __func__); - bts = the_bts.bts_data(); setup_bts(&the_bts, ts_no); /* keep the MS object 10 seconds */ OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2030, 10, OSMO_TDEF_S) == 0); - gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 2234, 2234, 2234, 1, 1, false, 0, 0, 0); + gprs_bssgp_init(bts, 2234, 2234, 1, 1, false, 0, 0, 0); /* Handle LLC frame 1 */ memset(buf, 1, sizeof(buf)); @@ -582,7 +582,7 @@ fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(); + gprs_bssgp_destroy(bts); } static gprs_rlcmac_ul_tbf *establish_ul_tbf_single_phase(BTS *the_bts, @@ -2165,19 +2165,19 @@ fprintf(stderr, "=== start %s ===\n", __func__); - bssgp_nsi = gprs_ns_instantiate(&gprs_bssgp_ns_cb, tall_pcu_ctx); - if (!bssgp_nsi) { + bts = the_bts.bts_data(); + bts->nsi = gprs_ns2_instantiate(tall_pcu_ctx, gprs_ns_prim_cb, NULL); + if (!bts->nsi) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n"); abort(); } - bts = the_bts.bts_data(); setup_bts(&the_bts, ts_no); /* EGPRS-only */ bts->egprs_enabled = 1; - gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 3234, 3234, 3234, 1, 1, false, 0, 0, 0); + gprs_bssgp_init(bts, 3234, 3234, 1, 1, false, 0, 0, 0); /* Does not support EGPRS */ rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, @@ -2186,12 +2186,13 @@ OSMO_ASSERT(rc == -EBUSY); fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(); + gprs_bssgp_destroy(bts); } static inline void ws_check(gprs_rlcmac_dl_tbf *dl_tbf, const char *test, uint8_t exp_slots, uint16_t exp_ws, bool free, bool end) { + gprs_rlcmac_bts *bts = dl_tbf->bts->bts_data(); if (!dl_tbf) { fprintf(stderr, "%s(): FAILED (NULL TBF)\n", test); return; @@ -2213,7 +2214,7 @@ if (end) { fprintf(stderr, "=== end %s ===\n", test); - gprs_bssgp_destroy(); + gprs_bssgp_destroy(bts); } } @@ -2228,13 +2229,13 @@ fprintf(stderr, "=== start %s ===\n", __func__); - bssgp_nsi = gprs_ns_instantiate(&gprs_bssgp_ns_cb, tall_pcu_ctx); - if (!bssgp_nsi) { + bts = the_bts.bts_data(); + bts->nsi = gprs_ns2_instantiate(tall_pcu_ctx, gprs_ns_prim_cb, NULL); + if (!bts->nsi) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n"); abort(); } - bts = the_bts.bts_data(); setup_bts(&the_bts, ts_no); bts->ws_base = 128; @@ -2245,7 +2246,7 @@ bts->trx[0].pdch[4].enable(); bts->trx[0].pdch[5].enable(); - gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 4234, 4234, 4234, 1, 1, false, 0, 0, 0); + gprs_bssgp_init(bts, 4234, 4234, 1, 1, false, 0, 0, 0); /* Does no support EGPRS */ ms = the_bts.ms_alloc(ms_class, 0); @@ -2274,13 +2275,13 @@ fprintf(stderr, "=== start %s ===\n", __func__); - bssgp_nsi = gprs_ns_instantiate(&gprs_bssgp_ns_cb, tall_pcu_ctx); - if (!bssgp_nsi) { + bts = the_bts.bts_data(); + bts->nsi = gprs_ns2_instantiate(tall_pcu_ctx, gprs_ns_prim_cb, NULL); + if (!bts->nsi) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n"); abort(); } - bts = the_bts.bts_data(); setup_bts(&the_bts, ts_no); bts->ws_base = 128; @@ -2291,7 +2292,7 @@ bts->trx[0].pdch[4].enable(); bts->trx[0].pdch[5].enable(); - gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 5234, 5234, 5234, 1, 1, false, 0, 0, 0); + gprs_bssgp_init(bts, 5234, 5234, 1, 1, false, 0, 0, 0); /* EGPRS-only */ bts->egprs_enabled = 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib389925cf5c9f18951af6242c31ea70476218e9a Gerrit-Change-Number: 20271 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 03:23:15 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 03:23:15 +0000 Subject: Change in osmo-bts[master]: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC ... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20272 ) Change subject: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC for PCU ...................................................................... Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC for PCU With PCU interface version 10 it supports IPv6 NSVC. The new OML IE NM_ATT_OSMO_NS_LINK_CFG allows to configure IPv6 NSVC. Change-Id: I310699fabbfec4255f0474f31717f215c1201eca --- M include/osmo-bts/bts.h M src/common/oml.c M src/common/pcu_sock.c 3 files changed, 63 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/72/20272/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index da321b0..78909fa 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -2,6 +2,7 @@ #define _BTS_H #include +#include #include #include @@ -69,9 +70,8 @@ * via OML from BSC */ int id; uint16_t nsvci; - uint16_t local_port; /* on the BTS */ - uint16_t remote_port; /* on the SGSN */ - uint32_t remote_ip; /* on the SGSN */ + struct osmo_sockaddr local; /* on the BTS */ + struct osmo_sockaddr remote; /* on the SGSN */ struct gsm_abis_mo mo; }; diff --git a/src/common/oml.c b/src/common/oml.c index 14fc80f..cc8e083 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1255,16 +1255,60 @@ uint16_t _cur_s; uint32_t _cur_l; + memset(&nsvc->local, 0, sizeof(nsvc->local)); + memset(&nsvc->remote, 0, sizeof(nsvc->remote)); + + nsvc->local.u.sin.sin_family = AF_INET; + nsvc->remote.u.sin.sin_family = AF_INET; + memcpy(&_cur_s, cur, 2); - nsvc->remote_port = ntohs(_cur_s); + nsvc->remote.u.sin.sin_port = _cur_s; cur += 2; memcpy(&_cur_l, cur, 4); - nsvc->remote_ip = ntohl(_cur_l); + nsvc->remote.u.sin.sin_addr.s_addr = _cur_l; cur += 4; memcpy(&_cur_s, cur, 2); - nsvc->local_port = ntohs(_cur_s); + nsvc->local.u.sin.sin_port = ntohs(_cur_s); } + if (TLVP_PRES_LEN(tp, NM_ATT_OSMO_NS_LINK_CFG, 10)) { + const uint8_t *cur = TLVP_VAL(tp, NM_ATT_OSMO_NS_LINK_CFG); + uint16_t address_family; + + memset(&nsvc->local, 0, sizeof(nsvc->local)); + memset(&nsvc->remote, 0, sizeof(nsvc->remote)); + + address_family = osmo_load16be(cur); + cur += 2; + + memcpy(&nsvc->local.u.sin.sin_port, cur, 2); + cur += 2; + + memcpy(&nsvc->remote.u.sin.sin_port, cur, 2); + cur += 2; + + switch (address_family) { + case IPPROTO_IPIP: + /* we already checked for 10 bytes */ + nsvc->remote.u.sas.ss_family = AF_INET; + nsvc->local.u.sas.ss_family = AF_INET; + memcpy(&nsvc->remote.u.sin.sin_addr.s_addr, cur, sizeof(in_addr_t)); + break; + case IPPROTO_IPV6: + if (TLVP_LEN(tp, NM_ATT_OSMO_NS_LINK_CFG) < 22) { + /* TODO error message */ + return -1; + } + nsvc->remote.u.sas.ss_family = AF_INET6; + nsvc->local.u.sas.ss_family = AF_INET; + memcpy(&nsvc->remote.u.sin6.sin6_addr, cur, sizeof(struct in6_addr)); + break; + default: + return -1; + } + } + + osmo_signal_dispatch(SS_GLOBAL, S_NEW_NSVC_ATTR, nsvc); return 0; @@ -1501,6 +1545,7 @@ DEBUGP(DOML, "Initializing OML attribute definitions\n"); tlv_def_patch(&abis_nm_att_tlvdef_ipa_local, &abis_nm_att_tlvdef_ipa); tlv_def_patch(&abis_nm_att_tlvdef_ipa_local, &abis_nm_att_tlvdef); + tlv_def_patch(&abis_nm_att_tlvdef_ipa_local, &abis_nm_osmo_att_tlvdef); return 0; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index c922584..b3124a3 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -326,14 +326,20 @@ info_ind->initial_cs = rlcc->initial_cs; info_ind->initial_mcs = rlcc->initial_mcs; - /* NSVC */ - for (i = 0; i < 2; i++) { + /* NSVC + * TODO: get the second nsvc in static configuration */ + for (i = 0; i < 1; i++) { nsvc = &bts->gprs.nsvc[i]; info_ind->nsvci[i] = nsvc->nsvci; - info_ind->local_port[i] = nsvc->local_port; - info_ind->remote_port[i] = nsvc->remote_port; - info_ind->remote_ip[i].v4.s_addr = htonl(nsvc->remote_ip); - info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV4; + info_ind->local_port[i] = nsvc->local.u.sin.sin_port; + info_ind->remote_port[i] = nsvc->remote.u.sin.sin_port; + if (nsvc->remote.u.sas.ss_family == AF_INET) { + info_ind->address_type[i] = IPPROTO_IPIP; + info_ind->remote_ip[i].v4 = nsvc->remote.u.sin.sin_addr; + } else { + info_ind->address_type[i] = IPPROTO_IPV6; + info_ind->remote_ip[i].v6 = nsvc->remote.u.sin6.sin6_addr; + } } llist_for_each_entry(trx, &bts->trx_list, list) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I310699fabbfec4255f0474f31717f215c1201eca Gerrit-Change-Number: 20272 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 03:33:14 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 03:33:14 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 to look at the new patch set (#3). Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 7 files changed, 83 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 03:56:51 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 03:56:51 +0000 Subject: Change in libosmocore[master]: ns2: vty: add missing docs for IPv6 address References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20273 ) Change subject: ns2: vty: add missing docs for IPv6 address ...................................................................... ns2: vty: add missing docs for IPv6 address Change-Id: I0ac04e1352ceadb7b787bcb3358c70e5bfd7c65b --- M src/gb/gprs_ns2_vty.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/20273/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 7798ac3..ab869c3 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -405,7 +405,8 @@ "nse <0-65535> remote-ip " VTY_IPV46_CMD, NSE_CMD_STR "Remote IP Address\n" - "Remote IP Address\n") + "Remote IPv4 Address\n" + "Remote IPv6 Address\n") { uint16_t nsei = atoi(argv[0]); struct ns2_vty_vc *vtyvc; @@ -556,7 +557,8 @@ "encapsulation udp local-ip " VTY_IPV46_CMD, ENCAPS_STR "NS over UDP Encapsulation\n" "Set the IP address on which we listen for NS/UDP\n" - "IP Address\n") + "IPv4 Address\n" + "IPv6 Address\n") { osmo_sockaddr_str_from_str2(&priv.udp, argv[0]); @@ -633,7 +635,8 @@ "encapsulation framerelay-gre local-ip " VTY_IPV46_CMD, ENCAPS_STR "NS over Frame Relay over GRE Encapsulation\n" "Set the IP address on which we listen for NS/FR/GRE\n" - "IP Address\n") + "IPv4 Address\n" + "IPv6 Address\n") { osmo_sockaddr_str_from_str2(&priv.frgreaddr, argv[0]); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ac04e1352ceadb7b787bcb3358c70e5bfd7c65b Gerrit-Change-Number: 20273 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:28:49 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:28:49 +0000 Subject: Change in osmo-pcu[master]: Use the new NS2 lib In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20271 ) Change subject: Use the new NS2 lib ...................................................................... Patch Set 1: Depends on I0ac04e1352ceadb7b787bcb3358c70e5bfd7c65b -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib389925cf5c9f18951af6242c31ea70476218e9a Gerrit-Change-Number: 20271 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 24 Sep 2020 13:28:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:31:28 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 13:31:28 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20262 ) Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 13:31:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:36:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:36:08 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc In-Reply-To: References: Message-ID: Hello pespin, daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20262 to look at the new patch set (#2). Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... gb/gprs_bssgb: check if talloc failed on btsctx->fc Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe --- M src/gb/gprs_bssgp.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/20262/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:36:34 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:36:34 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20262 ) Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20262/1/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/20262/1/src/gb/gprs_bssgp.c at 156 PS1, Line 156: rate_ctr_group_free(ctx->ctrg); > what about moving this one and the return above into goto at the end? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 13:36:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:38:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:38:33 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssg... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20263 ) Change subject: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20263/1/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/20263/1/src/gb/gprs_bssgp.c at 174 PS1, Line 174: osmo_timer_del(&ctx->fc->timer); > timer is freed here and it can happen if no osmo_timer_fd_setup is done on it. [?] It's not a problem to delete a timer which isn't setup()ed. The timer is not freed by del() and fc->timer is always valid. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id03ebef31bb513e2b3b5bc709a91e9352ebbbc79 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 13:38:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:38:51 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:38:51 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20264 ) Change subject: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20264/1/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/20264/1/src/gb/gprs_ns2_vty.c at 154 PS1, Line 154: return vtyvc; > THis can still return unassigned value if no entries in vtyc list and alloc_missing=false. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 13:38:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:43:31 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 13:43:31 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20269 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_frgre.c at a458 PS1, Line 458: return 0; Leaking msg? https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_udp.c at a207 PS1, Line 207: return 0; Are you leaking msg here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieb273371877dbc7e5b321c3b377e7142e43668d9 Gerrit-Change-Number: 20269 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 24 Sep 2020 13:43:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:49:46 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 13:49:46 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssg... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20263 ) Change subject: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id03ebef31bb513e2b3b5bc709a91e9352ebbbc79 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 13:49:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:51:55 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:51:55 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc In-Reply-To: References: Message-ID: Hello pespin, daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20262 to look at the new patch set (#3). Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... gb/gprs_bssgb: check if talloc failed on btsctx->fc Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe --- M src/gb/gprs_bssgp.c 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/20262/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:52:32 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 13:52:32 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20262 ) Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 13:52:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:54:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:54:10 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20269 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_frgre.c at a458 PS1, Line 458: return 0; > Leaking msg? never only in a separate patch https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/20269/1/src/gb/gprs_ns2_udp.c at a207 PS1, Line 207: return 0; > Are you leaking msg here? Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieb273371877dbc7e5b321c3b377e7142e43668d9 Gerrit-Change-Number: 20269 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 24 Sep 2020 13:54:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:58:03 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 13:58:03 +0000 Subject: Change in libosmocore[master]: ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20267 ) Change subject: ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20267/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/20267/2//COMMIT_MSG at 10 PS2, Line 10: gprs_ns2_nsvc_by_sockaddr2 is doing the lookup within a bind. Maybe make the name more descriptive like *_by_sockaddr_bind and *_by_sockaddr_nse? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-Comment-Date: Thu, 24 Sep 2020 13:58:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:58:36 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:58:36 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: check if talloc failed on btsctx->fc In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20262 ) Change subject: gb/gprs_bssgb: check if talloc failed on btsctx->fc ...................................................................... gb/gprs_bssgb: check if talloc failed on btsctx->fc Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe --- M src/gb/gprs_bssgp.c 1 file changed, 12 insertions(+), 4 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 9c119fb..e5b4380 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -146,17 +146,25 @@ ctx->nsei = nsei; /* FIXME: BVCI is not unique, only BVCI+NSEI ?!? */ ctx->ctrg = rate_ctr_group_alloc(ctx, &bssgp_ctrg_desc, bvci); - if (!ctx->ctrg) { - talloc_free(ctx); - return NULL; - } + if (!ctx->ctrg) + goto err_ctrg; + ctx->fc = talloc_zero(ctx, struct bssgp_flow_control); + if (!ctx->fc) + goto err_fc; + /* cofigure for 2Mbit, 30 packets in queue */ bssgp_fc_init(ctx->fc, 100000, 2*1024*1024/8, 30, &_bssgp_tx_dl_ud); llist_add(&ctx->list, &bssgp_bvc_ctxts); return ctx; + +err_fc: + rate_ctr_group_free(ctx->ctrg); +err_ctrg: + talloc_free(ctx); + return NULL; } void bssgp_bvc_ctx_free(struct bssgp_bvc_ctx *ctx) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1cfccc2cb696d9e95f590b99559d0a987031adfe Gerrit-Change-Number: 20262 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 13:58:49 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 13:58:49 +0000 Subject: Change in libosmocore[master]: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssg... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20263 ) Change subject: gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc ...................................................................... gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc Change-Id: Id03ebef31bb513e2b3b5bc709a91e9352ebbbc79 --- M src/gb/gprs_bssgp.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index e5b4380..8b8d534 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -171,6 +171,8 @@ { if (!ctx) return; + + osmo_timer_del(&ctx->fc->timer); rate_ctr_group_free(ctx->ctrg); llist_del(&ctx->list); talloc_free(ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id03ebef31bb513e2b3b5bc709a91e9352ebbbc79 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:03:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 14:03:18 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20264 to look at the new patch set (#4). Change subject: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found ...................................................................... ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found Fixes the parsing of persistent nsvcs. Change-Id: I297409f557f17df680ac76018b4202eb99713021 --- M src/gb/gprs_ns2_vty.c 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/20264/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:03:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 14:03:18 +0000 Subject: Change in libosmocore[master]: ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20267 to look at the new patch set (#3). Change subject: ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 ...................................................................... ns2: refactor gprs_ns2_find_vc_by_sockaddr -> gprs_ns2_nsvc_by_sockaddr2 gprs_ns2_nsvc_by_sockaddr is doing the lookup within a NSE. gprs_ns2_nsvc_by_sockaddr2 is doing the lookup within a bind. Also drop the *result pointer in the argument and return the NS-VC pointer if found or NULL. Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c 4 files changed, 14 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/20267/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:04:48 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 14:04:48 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20264 ) Change subject: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 14:04:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 14:05:40 +0000 Subject: Change in libosmocore[master]: ns2: improve naming of nsvc_by functions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20267 to look at the new patch set (#4). Change subject: ns2: improve naming of nsvc_by functions ...................................................................... ns2: improve naming of nsvc_by functions gprs_ns2_nsvc_by_sockaddr_nsei is doing the lookup within a NSE. gprs_ns2_nsvc_by_sockaddr_bind is doing the lookup within a bind. Also drop the *result pointer in the argument and return the NS-VC pointer if found or NULL. Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c 4 files changed, 14 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/20267/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:07:01 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 14:07:01 +0000 Subject: Change in libosmocore[master]: ns2: refactor nsvc_by_ functions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20267 to look at the new patch set (#5). Change subject: ns2: refactor nsvc_by_ functions ...................................................................... ns2: refactor nsvc_by_ functions gprs_ns2_nsvc_by_sockaddr_nsei is doing the lookup within a NSE. gprs_ns2_nsvc_by_sockaddr_bind is doing the lookup within a bind. Make both function look similiar and take similiar arguments. Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c 4 files changed, 14 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/20267/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:09:48 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 14:09:48 +0000 Subject: Change in libosmocore[master]: ns2: ns2_recv_vc: remove unused parameter nsi In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20268 ) Change subject: ns2: ns2_recv_vc: remove unused parameter nsi ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 Gerrit-Change-Number: 20268 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 24 Sep 2020 14:09:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:11:16 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 14:11:16 +0000 Subject: Change in libosmocore[master]: ns2: check the specific bit of NS SDU Control bits In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20266 ) Change subject: ns2: check the specific bit of NS SDU Control bits ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9632abe70585cb7aff2602590453d903dd88b48a Gerrit-Change-Number: 20266 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 14:11:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:15:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 14:15:09 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20269 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... Abandoned dup of 20270 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieb273371877dbc7e5b321c3b377e7142e43668d9 Gerrit-Change-Number: 20269 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:18:12 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 14:18:12 +0000 Subject: Change in libosmocore[master]: ns2: remove bssgp specific msgb->cb parts In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20265 ) Change subject: ns2: remove bssgp specific msgb->cb parts ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7edb8feb96436ba170383fc62d43ceb16955d53 Gerrit-Change-Number: 20265 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 14:18:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:19:13 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 14:19:13 +0000 Subject: Change in libosmocore[master]: ns2: fix a msg leak when receiving REJECTED messages References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20274 ) Change subject: ns2: fix a msg leak when receiving REJECTED messages ...................................................................... ns2: fix a msg leak when receiving REJECTED messages Change-Id: I7edc53c29c3dd09c395a275ceb8648b8eb19c06c --- M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/20274/1 diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index e2e0b29..e0797b6 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -453,8 +453,8 @@ goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ - frgre_sendmsg(bind, reject, &saddr); - return 0; + rc = frgre_sendmsg(bind, reject, &saddr); + goto out; case GPRS_NS2_CS_CREATED: frgre_alloc_vc(bind, nsvc, &saddr, dlci); gprs_ns2_vc_fsm_start(nsvc); diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index bda0acf..251f869 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -202,8 +202,8 @@ goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ - nsip_sendmsg(bind, reject, &saddr); - return 0; + rc = nsip_sendmsg(bind, reject, &saddr); + goto out; case GPRS_NS2_CS_CREATED: ns2_driver_alloc_vc(bind, nsvc, &saddr); gprs_ns2_vc_fsm_start(nsvc); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc53c29c3dd09c395a275ceb8648b8eb19c06c Gerrit-Change-Number: 20274 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:20:59 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 14:20:59 +0000 Subject: Change in libosmocore[master]: ns2: vty: add missing docs for IPv6 address In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20273 ) Change subject: ns2: vty: add missing docs for IPv6 address ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ac04e1352ceadb7b787bcb3358c70e5bfd7c65b Gerrit-Change-Number: 20273 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 24 Sep 2020 14:20:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 14:24:45 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 14:24:45 +0000 Subject: Change in libosmocore[master]: ns2: fix a msg leak when receiving REJECTED messages In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20274 ) Change subject: ns2: fix a msg leak when receiving REJECTED messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc53c29c3dd09c395a275ceb8648b8eb19c06c Gerrit-Change-Number: 20274 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 24 Sep 2020 14:24:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 15:40:54 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 15:40:54 +0000 Subject: Change in libosmocore[master]: ns2: refactor nsvc_by_ functions In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20267 ) Change subject: ns2: refactor nsvc_by_ functions ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 24 Sep 2020 15:40:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 15:41:53 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 24 Sep 2020 15:41:53 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20270 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b Gerrit-Change-Number: 20270 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 24 Sep 2020 15:41:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 15:42:31 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 Sep 2020 15:42:31 +0000 Subject: Change in docker-playground[master]: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20275 ) Change subject: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest ...................................................................... BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 --- M ttcn3-bsc-test/BSC_Tests.cfg M ttcn3-bsc-test/jenkins.sh 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/20275/1 diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 6aef022..c1a5b81 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -13,6 +13,7 @@ BSC_Tests.mp_bsc_ip := "172.18.2.20"; BSC_Tests.mp_test_ip := "172.18.2.203"; BSC_Tests.mp_enable_osmux_test := true; +BSC_Tests.mp_media_mgw_offer_ipv6 := true; BSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index d026463..e8cade8 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -35,6 +35,7 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg sed "/fd02:db8/d" -i $VOL_BASE_DIR/bsc/osmo-bsc.cfg + sed -i "s/^BSC_Tests.mp_media_mgw_offer_ipv6.*/BSC_Tests.mp_media_mgw_offer_ipv6 := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg fi SUBNET=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Gerrit-Change-Number: 20275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 15:43:31 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 Sep 2020 15:43:31 +0000 Subject: Change in docker-playground[master]: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20275 ) Change subject: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest ...................................................................... Patch Set 1: (not tested yet, will do this tomorrow, but would be good if you could have a look anyway.) -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Gerrit-Change-Number: 20275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 15:43:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 17:54:09 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 Sep 2020 17:54:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: remove remains of loopback functionality In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20247 ) Change subject: mgcp_vty: remove remains of loopback functionality ...................................................................... mgcp_vty: remove remains of loopback functionality There exist trunk_loop commands, which sets an trunk->audio_loop variable, however all it does is to turn on a log message. There is no actual implementation present. Lets set the VTY commands to DEFUN_DEPRECATED and remove the variable. Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 8 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 1002adb..8127181 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -24,7 +24,6 @@ char *audio_fmtp_extra; int audio_send_ptime; int audio_send_name; - int audio_loop; int no_audio_transcoding; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index fa40f1f..b452201 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -893,10 +893,6 @@ LOGPENDP(endp, DRTP, LOGL_DEBUG, "delivering RTCP packet...\n"); } - LOGPENDP(endp, DRTP, LOGL_DEBUG, "loop:%d, mode:%d%s\n", - trunk->audio_loop, conn_src->conn->mode, - conn_src->conn->mode == MGCP_CONN_LOOPBACK ? " (loopback)" : ""); - /* FIXME: It is legal that the payload type on the egress connection is * different from the payload type that has been negotiated on the * ingress connection. Essentially the codecs are the same so we can diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index aa27d41..cc7c5b8 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -115,7 +115,6 @@ trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-name%s", trunk->audio_send_name ? "" : "no ", VTY_NEWLINE); - vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE); vty_out(vty, " number endpoints %u%s", trunk->v.vty_number_endpoints, VTY_NEWLINE); vty_out(vty, " %sallow-transcoding%s", @@ -712,18 +711,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_loop, - cfg_mgcp_loop_cmd, - "loop (0|1)", - "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n") +DEFUN_DEPRECATED(cfg_mgcp_loop, + cfg_mgcp_loop_cmd, + "loop (0|1)", + "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - OSMO_ASSERT(trunk); - if (g_cfg->osmux) { - vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); - return CMD_WARNING; - } - trunk->audio_loop = atoi(argv[0]); return CMD_SUCCESS; } @@ -947,7 +939,6 @@ trunk->keepalive_interval, VTY_NEWLINE); else vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE); - vty_out(vty, " loop %d%s", trunk->audio_loop, VTY_NEWLINE); vty_out(vty, " force-realloc %d%s", trunk->force_realloc, VTY_NEWLINE); vty_out(vty, " rtp-accept-all %d%s", @@ -1019,18 +1010,11 @@ "sdp audio payload name NAME", SDP_STR AUDIO_STR AUDIO_STR "Payload\n" "Payload Name\n") -DEFUN(cfg_trunk_loop, - cfg_trunk_loop_cmd, - "loop (0|1)", - "Loop audio for all endpoints on this trunk\n" "Don't Loop\n" "Loop\n") +DEFUN_DEPRECATED(cfg_trunk_loop, + cfg_trunk_loop_cmd, + "loop (0|1)", + "Loop audio for all endpoints on this trunk\n" "Don't Loop\n" "Loop\n") { - struct mgcp_trunk *trunk = vty->index; - - if (g_cfg->osmux) { - vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); - return CMD_WARNING; - } - trunk->audio_loop = atoi(argv[0]); return CMD_SUCCESS; } @@ -1445,11 +1429,6 @@ else if (strcmp(argv[0], "only") == 0) g_cfg->osmux = OSMUX_USAGE_ONLY; - if (trunk->audio_loop) { - vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); - return CMD_WARNING; - } - return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1 Gerrit-Change-Number: 20247 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 17:55:20 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 Sep 2020 17:55:20 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: deprecate bind early command In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20248 ) Change subject: mgcp_vty: deprecate bind early command ...................................................................... mgcp_vty: deprecate bind early command The VTY command "bind early" is deprecated but it prints an error message and the DEFUN is not set to DEFUN_DEPRECATED. Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index cc7c5b8..440452f 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -442,14 +442,13 @@ return CMD_SUCCESS; } -DEFUN(cfg_mgcp_bind_early, - cfg_mgcp_bind_early_cmd, - "bind early (0|1)", - BIND_STR - "Bind local ports on start up\n" "Bind on demand\n" "Bind on startup\n") +DEFUN_DEPRECATED(cfg_mgcp_bind_early, + cfg_mgcp_bind_early_cmd, + "bind early (0|1)", + BIND_STR + "Bind local ports on start up\n" "Bind on demand\n" "Bind on startup\n") { - vty_out(vty, "bind early is deprecated, remove it from the config.\n"); - return CMD_WARNING; + return CMD_SUCCESS; } #define RTP_STR "RTP configuration\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I594a87d2f63826a9d7b4f6a380586b08b3b79518 Gerrit-Change-Number: 20248 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 17:56:33 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 Sep 2020 17:56:33 +0000 Subject: Change in osmo-mgw[master]: mgcp_e1: do not expose function mgcp_e1_init() In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20249 ) Change subject: mgcp_e1: do not expose function mgcp_e1_init() ...................................................................... mgcp_e1: do not expose function mgcp_e1_init() The initialization of the E1 line in mgcp_e1.c is controlled internally, there is no need to expose the function mgcp_e1_init(), lets make it static and remove the prefix mgcp_ Change-Id: I6aba1c55c9b1d729709ee1fba2994c77bd848a9b --- M include/osmocom/mgcp/mgcp_e1.h M src/libosmo-mgcp/mgcp_e1.c 2 files changed, 2 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_e1.h b/include/osmocom/mgcp/mgcp_e1.h index a4ae854..f0cf3ec 100644 --- a/include/osmocom/mgcp/mgcp_e1.h +++ b/include/osmocom/mgcp/mgcp_e1.h @@ -21,7 +21,6 @@ static const uint8_t e1_rates[] = { 64, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8 }; static const uint8_t e1_offsets[] = { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; -int mgcp_e1_init(struct mgcp_trunk *trunk, uint8_t ts_nr); int mgcp_e1_endp_equip(struct mgcp_endpoint *endp, uint8_t ts, uint8_t ss, uint8_t offs); void mgcp_e1_endp_update(struct mgcp_endpoint *endp); void mgcp_e1_endp_release(struct mgcp_endpoint *endp); diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index 50a2d85..7d4a29e 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -361,11 +361,7 @@ e1_send(ts, trunk); } -/*! Find an endpoint by its name on a specified trunk. - * \param[in] trunk trunk configuration. - * \param[in] ts_nr E1 timeslot number. - * \returns -EINVAL on failure, 0 on success. */ -int mgcp_e1_init(struct mgcp_trunk *trunk, uint8_t ts_nr) +static int e1_init(struct mgcp_trunk *trunk, uint8_t ts_nr) { /*! Each timeslot needs only to be configured once. The Timeslot then * stays open and permanently receives data. It is then up to the @@ -517,7 +513,7 @@ endp->e1.last_amr_ft = AMR_4_75; /* Set up E1 line / timeslot */ - rc = mgcp_e1_init(endp->trunk, ts); + rc = e1_init(endp->trunk, ts); if (rc != 0) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6aba1c55c9b1d729709ee1fba2994c77bd848a9b Gerrit-Change-Number: 20249 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 18:07:39 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 Sep 2020 18:07:39 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/20093 to look at the new patch set (#3). Change subject: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() ...................................................................... gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() The function gsm48_rx_cm_reest_req() is the only one where the return code of osmo_mobile_identity_decode_from_l3() is not checked, lets check it here too. Change-Id: I37981205870b094b3a40a20197461208daa62698 Fixes: CID#211037 --- M src/libmsc/gsm_04_08.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/20093/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37981205870b094b3a40a20197461208daa62698 Gerrit-Change-Number: 20093 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:05:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 24 Sep 2020 23:05:49 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20093 ) Change subject: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37981205870b094b3a40a20197461208daa62698 Gerrit-Change-Number: 20093 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 24 Sep 2020 23:05:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:32:04 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:32:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Move RAW_NS to library to use it in SGSN NS tests In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 to look at the new patch set (#2). Change subject: Move RAW_NS to library to use it in SGSN NS tests ...................................................................... Move RAW_NS to library to use it in SGSN NS tests Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 --- R library/RAW_NS.ttcn M pcu/gen_links.sh 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/20091/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 Gerrit-Change-Number: 20091 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:32:04 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:32:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 to look at the new patch set (#3). Change subject: SGSN: introduce NS tests ...................................................................... SGSN: introduce NS tests Similiar to the PCU_Tests_NS introduce SGSN_Tests_NS. Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 --- M sgsn/SGSN_Tests.cfg M sgsn/SGSN_Tests.ttcn A sgsn/SGSN_Tests_NS.ttcn M sgsn/gen_links.sh 4 files changed, 62 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/20008/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:32:06 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:32:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests.cfg: fixup renaming remote_proto -> address family References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20276 ) Change subject: SGSN_Tests.cfg: fixup renaming remote_proto -> address family ...................................................................... SGSN_Tests.cfg: fixup renaming remote_proto -> address family In an old version of the PCUIF version 10 this field was named remote_proto but got renamed into address_family before it was merged. Change-Id: Ia49169afe2db2503e99b62bb55639b2aeea546f2 --- M sgsn/SGSN_Tests.cfg 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/20276/1 diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index 26cee47..d6182eb 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -14,17 +14,17 @@ [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { { - remote_proto := AF_INET, + address_family := AF_INET, local_ip := "127.0.0.103", remote_ip := "127.0.0.10" }, { - remote_proto := AF_INET, + address_family := AF_INET, local_ip := "127.0.0.103", remote_ip := "127.0.0.10" }, { - remote_proto := AF_INET, + address_family := AF_INET, local_ip := "127.0.0.103", remote_ip := "127.0.0.10" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia49169afe2db2503e99b62bb55639b2aeea546f2 Gerrit-Change-Number: 20276 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:32:15 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:32:15 +0000 Subject: Change in libosmocore[master]: ns2: remove bssgp specific msgb->cb parts In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20265 ) Change subject: ns2: remove bssgp specific msgb->cb parts ...................................................................... ns2: remove bssgp specific msgb->cb parts There shouldn't be any knowledge of the upper layer in the NS layer. The PCU / SGSN / gbproxy have to add the pointer when parsing the primitives. Change-Id: Id7edb8feb96436ba170383fc62d43ceb16955d53 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 33a0328..7b07a49 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -469,9 +469,9 @@ /* TODO: nsh->data[0] -> C/R only valid in IP SNS */ bvci = nsh->data[1] << 8 | nsh->data[2]; - msgb_bssgph(msg) = &nsh->data[3]; - msgb_bvci(msg) = nsp.bvci = bvci; - msgb_nsei(msg) = nsp.nsei = priv->nsvc->nse->nsei; + msg->l3h = &nsh->data[3]; + nsp.bvci = bvci; + nsp.nsei = priv->nsvc->nse->nsei; if (nsh->data[0]) nsp.u.unitdata.change = NS_ENDPOINT_REQUEST_CHANGE; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7edb8feb96436ba170383fc62d43ceb16955d53 Gerrit-Change-Number: 20265 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:32:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:32:18 +0000 Subject: Change in libosmocore[master]: ns2: vty: add missing docs for IPv6 address In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20273 ) Change subject: ns2: vty: add missing docs for IPv6 address ...................................................................... ns2: vty: add missing docs for IPv6 address Change-Id: I0ac04e1352ceadb7b787bcb3358c70e5bfd7c65b --- M src/gb/gprs_ns2_vty.c 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 81f88b6..f204ff1 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -404,7 +404,8 @@ "nse <0-65535> remote-ip " VTY_IPV46_CMD, NSE_CMD_STR "Remote IP Address\n" - "Remote IP Address\n") + "Remote IPv4 Address\n" + "Remote IPv6 Address\n") { uint16_t nsei = atoi(argv[0]); struct ns2_vty_vc *vtyvc; @@ -555,7 +556,8 @@ "encapsulation udp local-ip " VTY_IPV46_CMD, ENCAPS_STR "NS over UDP Encapsulation\n" "Set the IP address on which we listen for NS/UDP\n" - "IP Address\n") + "IPv4 Address\n" + "IPv6 Address\n") { osmo_sockaddr_str_from_str2(&priv.udp, argv[0]); @@ -632,7 +634,8 @@ "encapsulation framerelay-gre local-ip " VTY_IPV46_CMD, ENCAPS_STR "NS over Frame Relay over GRE Encapsulation\n" "Set the IP address on which we listen for NS/FR/GRE\n" - "IP Address\n") + "IPv4 Address\n" + "IPv6 Address\n") { osmo_sockaddr_str_from_str2(&priv.frgreaddr, argv[0]); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ac04e1352ceadb7b787bcb3358c70e5bfd7c65b Gerrit-Change-Number: 20273 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:44:41 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 24 Sep 2020 23:44:41 +0000 Subject: Change in osmo-msc[master]: CC: fix sanity expectations for call establishment References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20277 ) Change subject: CC: fix sanity expectations for call establishment ...................................................................... CC: fix sanity expectations for call establishment Recent 'add full SDP codec information to the MNCC...' patch has added a strict CC state sanity check, which is too strict: In tests with 200 concurrent calls, situations came up where the MNCC is faster than the Abis in establishing a call. If that happens, the CC state machine is already in GSM_CSTATE_ACTIVE when the RR channel assignment completes. Also allow GSM_CSTATE_ACTIVE state for accepting an Assignment Complete. Change-Id: I0e0767ec10232615bbf063181fc7f8738ef94f28 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/20277/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 73b7c37..a1c0519 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1900,6 +1900,10 @@ /* MT call */ break; + case GSM_CSTATE_ACTIVE: + /* already active */ + break; + default: LOG_TRANS(trans, LOGL_ERROR, "Assignment done in unexpected CC state: %d\n", trans->cc.state); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0e0767ec10232615bbf063181fc7f8738ef94f28 Gerrit-Change-Number: 20277 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:44:41 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 24 Sep 2020 23:44:41 +0000 Subject: Change in osmo-msc[master]: drop duplicate ran_peer_find() vs ran_peer_find_by_addr() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20278 ) Change subject: drop duplicate ran_peer_find() vs ran_peer_find_by_addr() ...................................................................... drop duplicate ran_peer_find() vs ran_peer_find_by_addr() This is the same function existing twice with different names. Keep only one. Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf --- M include/osmocom/msc/ran_peer.h M src/libmsc/ran_peer.c 2 files changed, 3 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/20278/1 diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h index 06ab500..bdca317 100644 --- a/include/osmocom/msc/ran_peer.h +++ b/include/osmocom/msc/ran_peer.h @@ -91,7 +91,7 @@ }; struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); -struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); +struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); void ran_peer_cells_seen_add(struct ran_peer *ran_peer, const struct gsm0808_cell_id *id); @@ -106,4 +106,3 @@ struct ran_peer *ran_peer_find_by_cell_id(struct sccp_ran_inst *sri, const struct gsm0808_cell_id *cid, bool expecting_single_match); -struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr); diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 001dfb1..fcb5f5a 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -80,13 +80,13 @@ struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) { - struct ran_peer *rp = ran_peer_find(sri, peer_addr); + struct ran_peer *rp = ran_peer_find_by_addr(sri, peer_addr); if (rp) return rp; return ran_peer_alloc(sri, peer_addr); } -struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) +struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) { struct ran_peer *rp; llist_for_each_entry(rp, &sri->ran_peers, entry) { @@ -624,17 +624,6 @@ return found; } -struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr) -{ - struct ran_peer *rp; - - llist_for_each_entry(rp, &sri->ran_peers, entry) { - if (!osmo_sccp_addr_ri_cmp(addr, &rp->peer_addr)) - return rp; - } - return NULL; -} - int ran_peers_down_paging(struct sccp_ran_inst *sri, enum CELL_IDENT page_where, struct vlr_subscr *vsub, enum paging_cause cause) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf Gerrit-Change-Number: 20278 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:44:42 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 24 Sep 2020 23:44:42 +0000 Subject: Change in osmo-msc[master]: fix comment in ran_peer.h References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20279 ) Change subject: fix comment in ran_peer.h ...................................................................... fix comment in ran_peer.h Change-Id: Iff985dfe28265d32cae6a931636d5018a439d39e --- M include/osmocom/msc/ran_peer.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/20279/1 diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h index bdca317..c936d5c 100644 --- a/include/osmocom/msc/ran_peer.h +++ b/include/osmocom/msc/ran_peer.h @@ -42,7 +42,7 @@ * list is kept in sccp_ran_inst. For convenience, see ran_peer_for_each_ran_conn(). */ struct ran_peer { - /* Entry in sccp_ran_inst->ran_conns */ + /* Entry in sccp_ran_inst->ran_peers */ struct llist_head entry; struct sccp_ran_inst *sri; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iff985dfe28265d32cae6a931636d5018a439d39e Gerrit-Change-Number: 20279 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:49:38 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:49:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Fix Tns-alive/Tns-test expiration detection In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20186 ) Change subject: NS_Emulation: Fix Tns-alive/Tns-test expiration detection ...................................................................... Patch Set 1: Code-Review+2 The test procedure is still missing NS-ALIVE-RETRIES. But not sure if it's even needed in the Emulation. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icb7d076f57c166b498c1b3edd84edcf13ea9739d Gerrit-Change-Number: 20186 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 24 Sep 2020 23:49:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:54:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:54:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Prepare NSConfiguration for non-IP providers In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 ) Change subject: NS_Emulation: Prepare NSConfiguration for non-IP providers ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 Gerrit-Change-Number: 20117 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 24 Sep 2020 23:54:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:57:53 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:57:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Add [optional] support for FrameRelay transport In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118 ) Change subject: NS_Emulation: Add [optional] support for FrameRelay transport ...................................................................... Patch Set 9: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118/9/library/NS_Provider_FR.ttcn File library/NS_Provider_FR.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118/9/library/NS_Provider_FR.ttcn at 43 PS9, Line 43: while (true) { why not indenting the while body? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42ca811d23e383e362d2527c8ff2c916a62a5b42 Gerrit-Change-Number: 20118 Gerrit-PatchSet: 9 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 24 Sep 2020 23:57:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Sep 24 23:59:14 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 Sep 2020 23:59:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Introduce status events from provider -> emulation In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20122 ) Change subject: NS_Emulation: Introduce status events from provider -> emulation ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If00e9c50dc664ce62b6c0cbde99d741e8173169b Gerrit-Change-Number: 20122 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 24 Sep 2020 23:59:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 00:08:49 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 00:08:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Refactor if/elseif/... clause to altsteps with guard In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20123 ) Change subject: NS_Emulation: Refactor if/elseif/... clause to altsteps with guard ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4c38dd55b7c27899735f5730851d36c1410d96a8 Gerrit-Change-Number: 20123 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 00:08:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 00:09:46 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 00:09:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Delay Tx of first NS-RESET until Provider tells us it's up In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20127 ) Change subject: NS_Emulation: Delay Tx of first NS-RESET until Provider tells us it's up ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I300cfeb120540940990a834596b0a83a539df080 Gerrit-Change-Number: 20127 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 00:09:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 00:12:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 00:12:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: pass around string idenifier for components created In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128 ) Change subject: NS_Emulation: pass around string idenifier for components created ...................................................................... Patch Set 3: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128/3//COMMIT_MSG at 7 PS3, Line 7: nifier identifier https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128/3/library/NS_Provider_FR.ttcn File library/NS_Provider_FR.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128/3/library/NS_Provider_FR.ttcn at 35 PS3, Line 35: q933_cfg.T391 := 1.0; this should be in a separate patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0fe650243953e4d85161684865acd0354b2e465f Gerrit-Change-Number: 20128 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 00:12:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 00:29:39 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 00:29:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Prepare NSConfiguration for non-IP providers In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 ) Change subject: NS_Emulation: Prepare NSConfiguration for non-IP providers ...................................................................... Patch Set 7: Code-Review-1 it fails sgsn ns tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 Gerrit-Change-Number: 20117 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 00:29:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 00:36:32 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 00:36:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Prepare NSConfiguration for non-IP providers In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 ) Change subject: NS_Emulation: Prepare NSConfiguration for non-IP providers ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117/7/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117/7/sgsn/SGSN_Tests.ttcn at a76 PS7, Line 76: nsvci := 97, do not remove nsvci here! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 Gerrit-Change-Number: 20117 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 00:36:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Sep 25 02:26:16 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 25 Sep 2020 02:26:16 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f6d5560c4d89_25bb2af2c93dc5fc45147c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 225s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 225s] [COMPILING libboard/qmod/source/card_pres.c] [ 226s] [COMPILING libboard/qmod/source/wwan_led.c] [ 226s] [COMPILING libboard/qmod/source/i2c.c] [ 226s] [COMPILING libboard/qmod/source/board_qmod.c] [ 226s] [COMPILING apps/dfu/main.c] [ 226s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 227s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 227s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 227s] Memory region Used Size Region Size %age Used [ 227s] rom: 16588 B 16 KB 101.25% [ 227s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 227s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 227s] collect2: error: ld returned 1 exit status [ 227s] % [ 227s] make[2]: *** [Makefile:234: flash] Error 1 [ 227s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 227s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 227s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 227s] dh_auto_build: error: make -j1 returned exit code 2 [ 227s] make: *** [debian/rules:16: build] Error 25 [ 227s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 227s] ### VM INTERACTION START ### [ 230s] [ 217.884721] sysrq: Power Off [ 230s] [ 217.971073] reboot: Power down [ 230s] ### VM INTERACTION END ### [ 230s] [ 230s] lamb51 failed "build simtrace2_0.7.0.63.39070.dsc" at Fri Sep 25 02:25:57 UTC 2020. [ 230s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Sep 25 03:29:15 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 03:29:15 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Convert paging response timer into an osmocom own X4 timer All timeout values should use tdef. Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 --- M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/paging.c M src/libmsc/ran_infra.c M tests/test_nodes.vty 6 files changed, 21 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/20280/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 2122d4b..8e084b7 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -171,8 +171,6 @@ */ struct llist_head trans_list; - unsigned int paging_response_timer; - /* Radio Resource Location Protocol (TS 04.31) */ struct { enum rrlp_mode mode; diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index adb9ca7..d5cd1bd 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -70,8 +70,6 @@ net->mncc_guard_timeout = 180; net->ncss_guard_timeout = 30; - net->paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; - INIT_LLIST_HEAD(&net->trans_list); INIT_LLIST_HEAD(&net->upqueue); INIT_LLIST_HEAD(&net->neighbor_ident_list); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 29deb5e..95919b1 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -67,6 +67,7 @@ #include #include #include +#include static struct gsm_network *gsmnet = NULL; @@ -553,7 +554,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_msc_paging_response_timer, cfg_msc_paging_response_timer_cmd, +DEFUN_DEPRECATED(cfg_msc_paging_response_timer, cfg_msc_paging_response_timer_cmd, "paging response-timer (default|<1-65535>)", "Configure Paging\n" "Set Paging timeout, the minimum time to pass between (unsuccessful) Pagings sent towards" @@ -561,10 +562,22 @@ "Set to default timeout (" OSMO_STRINGIFY_VAL(MSC_PAGING_RESPONSE_TIMER_DEFAULT) " seconds)\n" "Set paging timeout in seconds\n") { + int rat; + int paging_response_timer; if (!strcmp(argv[0], "default")) - gsmnet->paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; + paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; else - gsmnet->paging_response_timer = atoi(argv[0]); + paging_response_timer = atoi(argv[0]); + + for (rat=0; rat X4 %s' instead%s", + VTY_NEWLINE, VTY_NEWLINE, argv[0], VTY_NEWLINE); + return CMD_SUCCESS; } @@ -762,9 +775,6 @@ vty_out(vty, " check-imei-rqd 1%s", VTY_NEWLINE); } - if (gsmnet->paging_response_timer != MSC_PAGING_RESPONSE_TIMER_DEFAULT) - vty_out(vty, " paging response-timer %u%s", gsmnet->paging_response_timer, VTY_NEWLINE); - if (gsmnet->emergency.route_to_msisdn) { vty_out(vty, " emergency-call route-to-msisdn %s%s", gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c index b288414..5e1f154 100644 --- a/src/libmsc/paging.c +++ b/src/libmsc/paging.c @@ -84,6 +84,7 @@ { int rc; struct paging_request *pr; + int paging_response_timer; struct gsm_network *net = vsub->vlr->user_ctx; pr = talloc(vsub, struct paging_request); @@ -110,8 +111,9 @@ /* reduced on the first paging callback */ vlr_subscr_get(vsub, VSUB_USE_PAGING); vsub->cs.is_paging = true; + paging_response_timer = osmo_tdef_get(msc_ran_infra[vsub->cs.attached_via_ran].tdefs, -4, OSMO_TDEF_S, 10); osmo_timer_setup(&vsub->cs.paging_response_timer, paging_response_timer_cb, vsub); - osmo_timer_schedule(&vsub->cs.paging_response_timer, net->paging_response_timer, 0); + osmo_timer_schedule(&vsub->cs.paging_response_timer, paging_response_timer, 0); } llist_add_tail(&pr->entry, &vsub->cs.requests); diff --git a/src/libmsc/ran_infra.c b/src/libmsc/ran_infra.c index af40541..c0eaa1a 100644 --- a/src/libmsc/ran_infra.c +++ b/src/libmsc/ran_infra.c @@ -43,6 +43,7 @@ { .T = -1, .default_val = 5, .desc = "RAN connection Complete Layer 3, Authentication and Ciphering timeout" }, \ { .T = -2, .default_val = 30, .desc = "RAN connection release sanity timeout" }, \ { .T = -3, .default_val = 10, .desc = "Timeout to find a target BSS after Handover Required" }, \ + { .T = -4, .default_val = 10, .desc = "Paging response timeout" }, \ struct osmo_tdef msc_tdefs_geran[] = { RAN_TDEFS @@ -55,6 +56,7 @@ }; struct osmo_tdef msc_tdefs_sgs[] = { + { .T = -4, .default_val = 10, .desc = "Paging response timeout" }, {} }; diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 520f07c..f86b96c 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -57,7 +57,6 @@ check-imei-rqd (0|1|early) cs7-instance-a <0-15> cs7-instance-iu <0-15> - paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN sms-over-gsup no sms-over-gsup -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 03:33:46 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 03:33:46 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Patch Set 1: TODO: check ttcn3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 25 Sep 2020 03:33:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 07:56:13 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 07:56:13 +0000 Subject: Change in osmo-sgsn[master]: gbproxy-usermanual: Explain BSSGP/BVC handling References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20281 ) Change subject: gbproxy-usermanual: Explain BSSGP/BVC handling ...................................................................... gbproxy-usermanual: Explain BSSGP/BVC handling Related: SYS#5005 Change-Id: I383fcd3864a94177f13909c6b8c15648900d3201 --- A doc/manuals/chapters/gbproxy-details.adoc M doc/manuals/chapters/gbproxy-overview.adoc M doc/manuals/osmogbproxy-usermanual.adoc 3 files changed, 121 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/81/20281/1 diff --git a/doc/manuals/chapters/gbproxy-details.adoc b/doc/manuals/chapters/gbproxy-details.adoc new file mode 100644 index 0000000..f77d40c --- /dev/null +++ b/doc/manuals/chapters/gbproxy-details.adoc @@ -0,0 +1,113 @@ +[[chapter_details]] +== Proxy details + +=== BVC handling + +This section describes in more detail how BVCs are handled in OsmoGbProxy + +If a BSS connects to OsmoGbProxy while the SGSN is not available it will +acknowledge the BVC RESET on the signalling BVC, but ignore other messages +(especially any PTP BVC RESET). + +.BSS connects to OsmoGbProxy +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + bss1 <=> gbproxy [label="NS link available"]; + bss1 => gbproxy [label="BVC RESET (BVCI=0)"]; + gbproxy => bss1 [label="BVC RESET ACK"]; + bss1 -x gbproxy [label="PTP BVC RESET (ignored)"]; +} +---- + +As soon as the SGSN is reachable through NS OsmoGbProxy will send a BVC RESET +to the signalling BVC towards the SGSN. After that completes it will reset the +signalling BVC of all BSS connections. At this point the BSS will send a BVC +RESET for its PTP BVCs which will be forwarded to the SGSN, similarly the PTP +BVC RESET ACK from the SGSN will be sent back to the BSS. + +.SGSN connection to OsmoGbProxy +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + gbproxy <=> sgsn [label="NS link available"]; + gbproxy => sgsn [label="BVC RESET (BVCI=0)"]; + sgsn => gbproxy [label="BVC RESET ACK"]; + + gbproxy => bss1 [label="BVC RESET (BVCI=0)"]; + bss1 => gbproxy [label="BVC RESET ACK"]; + bss1 box bss1 [label="PTP BVCs need to be reset"]; + bss1 => gbproxy [label="PTP BVC RESET (BVCI=x)"]; + gbproxy => sgsn [label="PTP BVC RESET (BVCI=x)"]; + sgsn => gbproxy [label="PTP BVC RESET ACK (BVCI=x)"]; + gbproxy => bss1 [label="PTP BVC RESET ACK (BVCI=x)"]; + bss2 <=> sgsn [label="BVCI x established"]; +} +---- + +The communication on the PTP BVC will then be forwarded between the BSS and the +SGSN. + +If a BSS connects while the SGSN is up the PTP BVC RESET will directly be +forwarded. + +.BSS connects to OsmoGbProxy +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + bss2 <=> gbproxy [label="NS link available"]; + bss2 => gbproxy [label="BVC RESET (BVCI=0)"]; + gbproxy => bss2 [label="BVC RESET ACK"]; + bss2 => gbproxy [label="PTP BVC RESET (BVCI=y)"]; + gbproxy => sgsn [label="PTP BVC RESET (BVCI=y)"]; + sgsn => gbproxy [label="PTP BVC RESET ACK (BVCI=y)"]; + gbproxy => bss2 [label="PTP BVC RESET ACK (BVCI=y)"]; + bss2 <=> sgsn [label="BVCI y established"]; +} +---- + +If OsmoGbProxy looses the connection to the SGSN it will reset the signalling +BVC of all BSS connections. This ensures that the BSS will not send traffic +over a PTP BVC before its reset procedure has been completed. + +.SGSN connection fails +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + gbproxy <=> sgsn [label="NS link fails"]; + gbproxy => bss1 [label="BVC RESET (BVCI=0)"]; + gbproxy => bss2 [label="BVC RESET (BVCI=0)"]; +} +---- + +When the connection to the SGSN is eventually restored the signalling BVC +between OsmoGbProxy and SGSN will be reset. + +After that completes OsmoGbProxy will reset the signalling BVC on all BSS NS +connections and forward the PTP BVC RESET messages. + +.SGSN connection restored +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + gbproxy <=> sgsn [label="NS link available"]; + gbproxy => sgsn [label="BVC RESET (BVCI=0)"]; + sgsn => gbproxy [label="BVC RESET ACK"]; + gbproxy => bss1 [label="BVC RESET (BVCI=0)"]; + bss1 => gbproxy [label="BVC RESET ACK"]; + bss1 box bss1 [label="PTP BVCs need to be reset"]; + gbproxy => bss2 [label="BVC RESET (BVCI=0)"]; + bss2 => gbproxy [label="BVC RESET ACK"]; + bss2 box bss2 [label="PTP BVCs need to be reset"]; +} +---- diff --git a/doc/manuals/chapters/gbproxy-overview.adoc b/doc/manuals/chapters/gbproxy-overview.adoc index 580afae..1564157 100644 --- a/doc/manuals/chapters/gbproxy-overview.adoc +++ b/doc/manuals/chapters/gbproxy-overview.adoc @@ -1,18 +1,18 @@ [[chapter_overview]] == Overview -=== About OsmoGbPROXY +=== About OsmoGbProxy -OsmoGbPROXY is the Osmocom proxy for the 3GPP Gb interface. The Gb +OsmoGbProxy is the Osmocom proxy for the 3GPP Gb interface. The Gb interface is defined by 3GPP as the protocol between the BSS and the SGSN inside the 2G/2.5G/2.75G packet switched network domain. As Osmocom implements a BTS-colocated PCU, there are potentially many Gb interface connections between all those many PCUs in the network and the SGSN. This can be cumbersome to configure/maintain at the -SGSN sine. +SGSN side. -OsmoGbPROXY aggregates many PCU-facing Gb connections into one Gb +OsmoGbProxy aggregates many PCU-facing Gb connections into one Gb connection to the SGSN. This is achieved by * maintaining sepaate NS-VCs on the PCU side and on the SGSN side @@ -21,11 +21,12 @@ * having some special handling for the signaling BVC (BVCI=0) which is shared among all the PCUs connected to the proxy + === Data Model ==== gbproxy_config -This contains the parsed configuration of the OsmoGbPROXY. +This contains the parsed configuration of the OsmoGbProxy. ==== gproxy_peer diff --git a/doc/manuals/osmogbproxy-usermanual.adoc b/doc/manuals/osmogbproxy-usermanual.adoc index c4e0b9d..c93ebec 100644 --- a/doc/manuals/osmogbproxy-usermanual.adoc +++ b/doc/manuals/osmogbproxy-usermanual.adoc @@ -9,6 +9,8 @@ include::{srcdir}/chapters/gbproxy-overview.adoc[] +include::{srcdir}/chapters/gbproxy-details.adoc[] + include::{srcdir}/chapters/gbproxy-running.adoc[] include::{srcdir}/chapters/gbproxy-control.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I383fcd3864a94177f13909c6b8c15648900d3201 Gerrit-Change-Number: 20281 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 08:01:15 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 08:01:15 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/20280/1/src/libmsc/paging.c File src/libmsc/paging.c: https://gerrit.osmocom.org/c/osmo-msc/+/20280/1/src/libmsc/paging.c at 88 PS1, Line 88: struct gsm_network *net = vsub->vlr->user_ctx; This is now unused -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-CC: daniel Gerrit-Comment-Date: Fri, 25 Sep 2020 08:01:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 08:08:09 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 08:08:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Refactor if/elseif/... clause to altsteps with guard In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20123 ) Change subject: NS_Emulation: Refactor if/elseif/... clause to altsteps with guard ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4c38dd55b7c27899735f5730851d36c1410d96a8 Gerrit-Change-Number: 20123 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 08:08:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 08:09:46 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 08:09:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Delay Tx of first NS-RESET until Provider tells us it's up In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20127 ) Change subject: NS_Emulation: Delay Tx of first NS-RESET until Provider tells us it's up ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I300cfeb120540940990a834596b0a83a539df080 Gerrit-Change-Number: 20127 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 08:09:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 08:11:23 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 08:11:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: pass around string idenifier for components created In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128 ) Change subject: NS_Emulation: pass around string idenifier for components created ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128/3/library/NS_Provider_FR.ttcn File library/NS_Provider_FR.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128/3/library/NS_Provider_FR.ttcn at 35 PS3, Line 35: q933_cfg.T391 := 1.0; > this should be in a separate patch. ACK -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0fe650243953e4d85161684865acd0354b2e465f Gerrit-Change-Number: 20128 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-Comment-Date: Fri, 25 Sep 2020 08:11:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:40:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:40:15 +0000 Subject: Change in osmo-sgsn[master]: gbproxy-usermanual: Explain BSSGP/BVC handling In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20281 ) Change subject: gbproxy-usermanual: Explain BSSGP/BVC handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I383fcd3864a94177f13909c6b8c15648900d3201 Gerrit-Change-Number: 20281 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:40:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:40:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:40:19 +0000 Subject: Change in osmo-sgsn[master]: gbproxy-usermanual: Explain BSSGP/BVC handling In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20281 ) Change subject: gbproxy-usermanual: Explain BSSGP/BVC handling ...................................................................... gbproxy-usermanual: Explain BSSGP/BVC handling Related: SYS#5005 Change-Id: I383fcd3864a94177f13909c6b8c15648900d3201 --- A doc/manuals/chapters/gbproxy-details.adoc M doc/manuals/chapters/gbproxy-overview.adoc M doc/manuals/osmogbproxy-usermanual.adoc 3 files changed, 121 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/gbproxy-details.adoc b/doc/manuals/chapters/gbproxy-details.adoc new file mode 100644 index 0000000..f77d40c --- /dev/null +++ b/doc/manuals/chapters/gbproxy-details.adoc @@ -0,0 +1,113 @@ +[[chapter_details]] +== Proxy details + +=== BVC handling + +This section describes in more detail how BVCs are handled in OsmoGbProxy + +If a BSS connects to OsmoGbProxy while the SGSN is not available it will +acknowledge the BVC RESET on the signalling BVC, but ignore other messages +(especially any PTP BVC RESET). + +.BSS connects to OsmoGbProxy +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + bss1 <=> gbproxy [label="NS link available"]; + bss1 => gbproxy [label="BVC RESET (BVCI=0)"]; + gbproxy => bss1 [label="BVC RESET ACK"]; + bss1 -x gbproxy [label="PTP BVC RESET (ignored)"]; +} +---- + +As soon as the SGSN is reachable through NS OsmoGbProxy will send a BVC RESET +to the signalling BVC towards the SGSN. After that completes it will reset the +signalling BVC of all BSS connections. At this point the BSS will send a BVC +RESET for its PTP BVCs which will be forwarded to the SGSN, similarly the PTP +BVC RESET ACK from the SGSN will be sent back to the BSS. + +.SGSN connection to OsmoGbProxy +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + gbproxy <=> sgsn [label="NS link available"]; + gbproxy => sgsn [label="BVC RESET (BVCI=0)"]; + sgsn => gbproxy [label="BVC RESET ACK"]; + + gbproxy => bss1 [label="BVC RESET (BVCI=0)"]; + bss1 => gbproxy [label="BVC RESET ACK"]; + bss1 box bss1 [label="PTP BVCs need to be reset"]; + bss1 => gbproxy [label="PTP BVC RESET (BVCI=x)"]; + gbproxy => sgsn [label="PTP BVC RESET (BVCI=x)"]; + sgsn => gbproxy [label="PTP BVC RESET ACK (BVCI=x)"]; + gbproxy => bss1 [label="PTP BVC RESET ACK (BVCI=x)"]; + bss2 <=> sgsn [label="BVCI x established"]; +} +---- + +The communication on the PTP BVC will then be forwarded between the BSS and the +SGSN. + +If a BSS connects while the SGSN is up the PTP BVC RESET will directly be +forwarded. + +.BSS connects to OsmoGbProxy +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + bss2 <=> gbproxy [label="NS link available"]; + bss2 => gbproxy [label="BVC RESET (BVCI=0)"]; + gbproxy => bss2 [label="BVC RESET ACK"]; + bss2 => gbproxy [label="PTP BVC RESET (BVCI=y)"]; + gbproxy => sgsn [label="PTP BVC RESET (BVCI=y)"]; + sgsn => gbproxy [label="PTP BVC RESET ACK (BVCI=y)"]; + gbproxy => bss2 [label="PTP BVC RESET ACK (BVCI=y)"]; + bss2 <=> sgsn [label="BVCI y established"]; +} +---- + +If OsmoGbProxy looses the connection to the SGSN it will reset the signalling +BVC of all BSS connections. This ensures that the BSS will not send traffic +over a PTP BVC before its reset procedure has been completed. + +.SGSN connection fails +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + gbproxy <=> sgsn [label="NS link fails"]; + gbproxy => bss1 [label="BVC RESET (BVCI=0)"]; + gbproxy => bss2 [label="BVC RESET (BVCI=0)"]; +} +---- + +When the connection to the SGSN is eventually restored the signalling BVC +between OsmoGbProxy and SGSN will be reset. + +After that completes OsmoGbProxy will reset the signalling BVC on all BSS NS +connections and forward the PTP BVC RESET messages. + +.SGSN connection restored +[mscgen] +---- +msc { + hscale="1.8"; + bss1 [label="BSS1"], bss2 [label="BSS2"], gbproxy [label="GbProxy"], sgsn [label="SGSN"]; + gbproxy <=> sgsn [label="NS link available"]; + gbproxy => sgsn [label="BVC RESET (BVCI=0)"]; + sgsn => gbproxy [label="BVC RESET ACK"]; + gbproxy => bss1 [label="BVC RESET (BVCI=0)"]; + bss1 => gbproxy [label="BVC RESET ACK"]; + bss1 box bss1 [label="PTP BVCs need to be reset"]; + gbproxy => bss2 [label="BVC RESET (BVCI=0)"]; + bss2 => gbproxy [label="BVC RESET ACK"]; + bss2 box bss2 [label="PTP BVCs need to be reset"]; +} +---- diff --git a/doc/manuals/chapters/gbproxy-overview.adoc b/doc/manuals/chapters/gbproxy-overview.adoc index 580afae..1564157 100644 --- a/doc/manuals/chapters/gbproxy-overview.adoc +++ b/doc/manuals/chapters/gbproxy-overview.adoc @@ -1,18 +1,18 @@ [[chapter_overview]] == Overview -=== About OsmoGbPROXY +=== About OsmoGbProxy -OsmoGbPROXY is the Osmocom proxy for the 3GPP Gb interface. The Gb +OsmoGbProxy is the Osmocom proxy for the 3GPP Gb interface. The Gb interface is defined by 3GPP as the protocol between the BSS and the SGSN inside the 2G/2.5G/2.75G packet switched network domain. As Osmocom implements a BTS-colocated PCU, there are potentially many Gb interface connections between all those many PCUs in the network and the SGSN. This can be cumbersome to configure/maintain at the -SGSN sine. +SGSN side. -OsmoGbPROXY aggregates many PCU-facing Gb connections into one Gb +OsmoGbProxy aggregates many PCU-facing Gb connections into one Gb connection to the SGSN. This is achieved by * maintaining sepaate NS-VCs on the PCU side and on the SGSN side @@ -21,11 +21,12 @@ * having some special handling for the signaling BVC (BVCI=0) which is shared among all the PCUs connected to the proxy + === Data Model ==== gbproxy_config -This contains the parsed configuration of the OsmoGbPROXY. +This contains the parsed configuration of the OsmoGbProxy. ==== gproxy_peer diff --git a/doc/manuals/osmogbproxy-usermanual.adoc b/doc/manuals/osmogbproxy-usermanual.adoc index c4e0b9d..c93ebec 100644 --- a/doc/manuals/osmogbproxy-usermanual.adoc +++ b/doc/manuals/osmogbproxy-usermanual.adoc @@ -9,6 +9,8 @@ include::{srcdir}/chapters/gbproxy-overview.adoc[] +include::{srcdir}/chapters/gbproxy-details.adoc[] + include::{srcdir}/chapters/gbproxy-running.adoc[] include::{srcdir}/chapters/gbproxy-control.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I383fcd3864a94177f13909c6b8c15648900d3201 Gerrit-Change-Number: 20281 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:40:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:40:46 +0000 Subject: Change in osmo-msc[master]: drop duplicate ran_peer_find() vs ran_peer_find_by_addr() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20278 ) Change subject: drop duplicate ran_peer_find() vs ran_peer_find_by_addr() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf Gerrit-Change-Number: 20278 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:40:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:40:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:40:56 +0000 Subject: Change in osmo-msc[master]: fix comment in ran_peer.h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20279 ) Change subject: fix comment in ran_peer.h ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iff985dfe28265d32cae6a931636d5018a439d39e Gerrit-Change-Number: 20279 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:40:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:40:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:40:59 +0000 Subject: Change in osmo-msc[master]: drop duplicate ran_peer_find() vs ran_peer_find_by_addr() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20278 ) Change subject: drop duplicate ran_peer_find() vs ran_peer_find_by_addr() ...................................................................... drop duplicate ran_peer_find() vs ran_peer_find_by_addr() This is the same function existing twice with different names. Keep only one. Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf --- M include/osmocom/msc/ran_peer.h M src/libmsc/ran_peer.c 2 files changed, 3 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h index 06ab500..bdca317 100644 --- a/include/osmocom/msc/ran_peer.h +++ b/include/osmocom/msc/ran_peer.h @@ -91,7 +91,7 @@ }; struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); -struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); +struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); void ran_peer_cells_seen_add(struct ran_peer *ran_peer, const struct gsm0808_cell_id *id); @@ -106,4 +106,3 @@ struct ran_peer *ran_peer_find_by_cell_id(struct sccp_ran_inst *sri, const struct gsm0808_cell_id *cid, bool expecting_single_match); -struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr); diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 001dfb1..fcb5f5a 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -80,13 +80,13 @@ struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) { - struct ran_peer *rp = ran_peer_find(sri, peer_addr); + struct ran_peer *rp = ran_peer_find_by_addr(sri, peer_addr); if (rp) return rp; return ran_peer_alloc(sri, peer_addr); } -struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) +struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) { struct ran_peer *rp; llist_for_each_entry(rp, &sri->ran_peers, entry) { @@ -624,17 +624,6 @@ return found; } -struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr) -{ - struct ran_peer *rp; - - llist_for_each_entry(rp, &sri->ran_peers, entry) { - if (!osmo_sccp_addr_ri_cmp(addr, &rp->peer_addr)) - return rp; - } - return NULL; -} - int ran_peers_down_paging(struct sccp_ran_inst *sri, enum CELL_IDENT page_where, struct vlr_subscr *vsub, enum paging_cause cause) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf Gerrit-Change-Number: 20278 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:40:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:40:59 +0000 Subject: Change in osmo-msc[master]: fix comment in ran_peer.h In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20279 ) Change subject: fix comment in ran_peer.h ...................................................................... fix comment in ran_peer.h Change-Id: Iff985dfe28265d32cae6a931636d5018a439d39e --- M include/osmocom/msc/ran_peer.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h index bdca317..c936d5c 100644 --- a/include/osmocom/msc/ran_peer.h +++ b/include/osmocom/msc/ran_peer.h @@ -42,7 +42,7 @@ * list is kept in sccp_ran_inst. For convenience, see ran_peer_for_each_ran_conn(). */ struct ran_peer { - /* Entry in sccp_ran_inst->ran_conns */ + /* Entry in sccp_ran_inst->ran_peers */ struct llist_head entry; struct sccp_ran_inst *sri; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iff985dfe28265d32cae6a931636d5018a439d39e Gerrit-Change-Number: 20279 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:41:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:41:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests.cfg: fixup renaming remote_proto -> address family In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20276 ) Change subject: SGSN_Tests.cfg: fixup renaming remote_proto -> address family ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia49169afe2db2503e99b62bb55639b2aeea546f2 Gerrit-Change-Number: 20276 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:41:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:41:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:41:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests.cfg: fixup renaming remote_proto -> address family In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20276 ) Change subject: SGSN_Tests.cfg: fixup renaming remote_proto -> address family ...................................................................... SGSN_Tests.cfg: fixup renaming remote_proto -> address family In an old version of the PCUIF version 10 this field was named remote_proto but got renamed into address_family before it was merged. Change-Id: Ia49169afe2db2503e99b62bb55639b2aeea546f2 --- M sgsn/SGSN_Tests.cfg 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index 26cee47..d6182eb 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -14,17 +14,17 @@ [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { { - remote_proto := AF_INET, + address_family := AF_INET, local_ip := "127.0.0.103", remote_ip := "127.0.0.10" }, { - remote_proto := AF_INET, + address_family := AF_INET, local_ip := "127.0.0.103", remote_ip := "127.0.0.10" }, { - remote_proto := AF_INET, + address_family := AF_INET, local_ip := "127.0.0.103", remote_ip := "127.0.0.10" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia49169afe2db2503e99b62bb55639b2aeea546f2 Gerrit-Change-Number: 20276 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:42:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:42:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Move RAW_NS to library to use it in SGSN NS tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 ) Change subject: Move RAW_NS to library to use it in SGSN NS tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 Gerrit-Change-Number: 20091 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 09:42:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:42:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:42:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Move RAW_NS to library to use it in SGSN NS tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 ) Change subject: Move RAW_NS to library to use it in SGSN NS tests ...................................................................... Move RAW_NS to library to use it in SGSN NS tests Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 --- R library/RAW_NS.ttcn M pcu/gen_links.sh 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/RAW_NS.ttcn b/library/RAW_NS.ttcn similarity index 100% rename from pcu/RAW_NS.ttcn rename to library/RAW_NS.ttcn diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index a1e2e44..8b87e18 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -53,7 +53,7 @@ FILES+="NS_Provider_IPL4.ttcn NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " -FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn " +FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn RAW_NS.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0e62cc9f032c515188530c0ceee29061fe11d2 Gerrit-Change-Number: 20091 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:42:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:42:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 ) Change subject: SGSN: introduce NS tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 09:42:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:42:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:42:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: introduce NS tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 ) Change subject: SGSN: introduce NS tests ...................................................................... SGSN: introduce NS tests Similiar to the PCU_Tests_NS introduce SGSN_Tests_NS. Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 --- M sgsn/SGSN_Tests.cfg M sgsn/SGSN_Tests.ttcn A sgsn/SGSN_Tests_NS.ttcn M sgsn/gen_links.sh 4 files changed, 62 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index d6182eb..d5c3a4c 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -42,3 +42,4 @@ [EXECUTE] SGSN_Tests.control SGSN_Tests_Iu.control +SGSN_Tests_NS.control diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index abbcb64..b42020d 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -12,6 +12,7 @@ */ friend module SGSN_Tests_Iu; +friend module SGSN_Tests_NS; import from General_Types all; import from Osmocom_Types all; @@ -257,7 +258,7 @@ vc_GTP.start(GTP_Emulation.main(gtp_cfg)); } -private function f_init_vty() runs on test_CT { +friend function f_init_vty() runs on test_CT { map(self:SGSNVTY, system:SGSNVTY); f_vty_set_prompts(SGSNVTY); f_vty_transceive(SGSNVTY, "enable"); diff --git a/sgsn/SGSN_Tests_NS.ttcn b/sgsn/SGSN_Tests_NS.ttcn new file mode 100644 index 0000000..cce32cc --- /dev/null +++ b/sgsn/SGSN_Tests_NS.ttcn @@ -0,0 +1,58 @@ +module SGSN_Tests_NS { + +/* Osmocom SGSN test suite in TTCN-3 + * (C) 2020 sysmocom - s.f.m.c. GmbH + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from Osmocom_Types all; +import from Osmocom_Gb_Types all; +import from Osmocom_VTY_Functions all; +import from NS_CodecPort all; +import from NS_Types all; +import from RAW_NS all; +import from SGSN_Tests all; + +type component RAW_Test_CT extends RAW_NS_CT, test_CT { +} + +testcase TC_NS_connect_reset() runs on RAW_Test_CT { + f_init_vty(); + f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0, tc_offset := 10); + f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock enabled"); + + /* Send a NS-ALIVE */ + f_outgoing_ns_reset(); + + f_sleep(1.0); + f_cleanup(); +} + +testcase TC_NS_connect_alive() runs on RAW_Test_CT { + f_init_vty(); + f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0, tc_offset := 20); + f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock disabled"); + + /* Send a NS-ALIVE */ + NSCP[0].send(t_NS_Send(g_ns_conn_id[0], t_NS_ALIVE)); + alt { + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); + [] NSCP[0].receive(t_NS_RecvFrom(tr_NS_STATUS(*))) { setverdict(fail); } + [] NSCP[0].receive { repeat; } + } + + f_sleep(1.0); + f_cleanup(); +} + +control { + execute( TC_NS_connect_alive() ); + execute( TC_NS_connect_reset() ); +} + +} diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index c9de23a..334df59 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -92,8 +92,7 @@ FILES+="RAN_Emulation.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc GSUP_Types.ttcn GSUP_Emulation.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn -GTP_Templates.ttcn IPCP_Types.ttcn " +FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn RAW_NS.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2bffbb110961474928f35d212cb492d4b6fdee0 Gerrit-Change-Number: 20008 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:43:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:43:40 +0000 Subject: Change in libosmocore[master]: ns2: check the specific bit of NS SDU Control bits In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20266 ) Change subject: ns2: check the specific bit of NS SDU Control bits ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9632abe70585cb7aff2602590453d903dd88b48a Gerrit-Change-Number: 20266 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 09:43:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:44:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:44:18 +0000 Subject: Change in libosmocore[master]: ns2: refactor nsvc_by_ functions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20267 ) Change subject: ns2: refactor nsvc_by_ functions ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:44:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:44:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:44:35 +0000 Subject: Change in libosmocore[master]: ns2: ns2_recv_vc: remove unused parameter nsi In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20268 ) Change subject: ns2: ns2_recv_vc: remove unused parameter nsi ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 Gerrit-Change-Number: 20268 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:44:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:45:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:45:15 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20264 ) Change subject: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 09:45:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:45:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:45:25 +0000 Subject: Change in libosmocore[master]: ns2: check the specific bit of NS SDU Control bits In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20266 ) Change subject: ns2: check the specific bit of NS SDU Control bits ...................................................................... ns2: check the specific bit of NS SDU Control bits Change-Id: I9632abe70585cb7aff2602590453d903dd88b48a --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 7b07a49..d13f1ce 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -473,7 +473,8 @@ nsp.bvci = bvci; nsp.nsei = priv->nsvc->nse->nsei; - if (nsh->data[0]) + /* 10.3.9 NS SDU Control Bits */ + if (nsh->data[0] & 0x1) nsp.u.unitdata.change = NS_ENDPOINT_REQUEST_CHANGE; osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9632abe70585cb7aff2602590453d903dd88b48a Gerrit-Change-Number: 20266 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:45:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:45:26 +0000 Subject: Change in libosmocore[master]: ns2: refactor nsvc_by_ functions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20267 ) Change subject: ns2: refactor nsvc_by_ functions ...................................................................... ns2: refactor nsvc_by_ functions gprs_ns2_nsvc_by_sockaddr_nsei is doing the lookup within a NSE. gprs_ns2_nsvc_by_sockaddr_bind is doing the lookup within a bind. Make both function look similiar and take similiar arguments. Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c 4 files changed, 14 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index 68484c1..cd2de96 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -131,10 +131,9 @@ struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind); int gprs_ns2_is_ip_bind(struct gprs_ns2_vc_bind *bind); int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp); -int gprs_ns2_find_vc_by_sockaddr( +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind( struct gprs_ns2_vc_bind *bind, - struct osmo_sockaddr *saddr, - struct gprs_ns2_vc **result); + struct osmo_sockaddr *saddr); int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi, struct osmo_sockaddr *local, @@ -142,8 +141,9 @@ struct gprs_ns2_vc_bind **result); int gprs_ns2_is_frgre_bind(struct gprs_ns2_vc_bind *bind); -struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr(struct gprs_ns2_nse *nsei, - struct osmo_sockaddr *sockaddr); +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_nse( + struct gprs_ns2_nse *nse, + struct osmo_sockaddr *sockaddr); void gprs_ns2_start_alive_all_nsvcs(struct gprs_ns2_nse *nse); const char *gprs_ns2_cause_str(int cause); const char *gprs_ns2_ll_str(struct gprs_ns2_vc *nsvc); diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 57a08d1..835c22a 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -824,7 +824,7 @@ * \param[in] nse NS Entity in which to search * \param[in] sockaddr socket address to search for * \return NS-VC matching sockaddr; NULL if none found */ -struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr(struct gprs_ns2_nse *nse, +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_nse(struct gprs_ns2_nse *nse, struct osmo_sockaddr *sockaddr) { struct gprs_ns2_vc *nsvc; diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 812200d..753ac4d 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -179,7 +179,7 @@ sa.u.sin.sin_port = ip4->udp_port; sa.u.sin.sin_family = AF_INET; - return gprs_ns2_nsvc_by_sockaddr(nse, &sa); + return gprs_ns2_nsvc_by_sockaddr_nse(nse, &sa); } static struct gprs_ns2_vc *nsvc_by_ip6_elem(struct gprs_ns2_nse *nse, @@ -191,7 +191,7 @@ sa.u.sin6.sin6_port = ip6->udp_port; sa.u.sin6.sin6_family = AF_INET; - return gprs_ns2_nsvc_by_sockaddr(nse, &sa); + return gprs_ns2_nsvc_by_sockaddr_nse(nse, &sa); } /*! called when a nsvc is beeing freed */ diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index bb421a7..9994a72 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -81,16 +81,12 @@ /*! Find a NS-VC by its remote socket address. * \param[in] bind in which to search * \param[in] saddr remote peer socket adddress to search - * \param[out] result pointer to result - * \returns 0 on success; 1 if no NS-VC was found; negative on error */ -int gprs_ns2_find_vc_by_sockaddr(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr, struct gprs_ns2_vc **result) + * \returns NS-VC matching sockaddr; NULL if none found */ +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr) { struct gprs_ns2_vc *nsvc; struct priv_vc *vcpriv; - if (!result) - return -EINVAL; - llist_for_each_entry(nsvc, &bind->nsvc, blist) { vcpriv = nsvc->priv; if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family) @@ -98,11 +94,10 @@ if (osmo_sockaddr_cmp(&vcpriv->remote, saddr)) continue; - *result = nsvc; - return 0; + return nsvc; } - return 1; + return NULL; } static inline int nsip_sendmsg(struct gprs_ns2_vc_bind *bind, @@ -194,8 +189,8 @@ return -EINVAL; /* check if a vc is available */ - rc = gprs_ns2_find_vc_by_sockaddr(bind, &saddr, &nsvc); - if (rc) { + nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, &saddr); + if (!nsvc) { /* VC not found */ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:45:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:45:27 +0000 Subject: Change in libosmocore[master]: ns2: ns2_recv_vc: remove unused parameter nsi In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20268 ) Change subject: ns2: ns2_recv_vc: remove unused parameter nsi ...................................................................... ns2: ns2_recv_vc: remove unused parameter nsi Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c 4 files changed, 8 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 835c22a..05d4972 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -844,12 +844,10 @@ /*! Bottom-side entry-point for received NS PDU from the driver/bind - * \param[in] nsi NS instance * \param[in] nsvc NS-VC for which the message was received * \param msg the received message. Ownership is trasnferred, caller must not free it! * \return 0 on success; negative on error */ -int ns2_recv_vc(struct gprs_ns2_inst *nsi, - struct gprs_ns2_vc *nsvc, +int ns2_recv_vc(struct gprs_ns2_vc *nsvc, struct msgb *msg) { struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 715c41a..0903e46 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -446,7 +446,7 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: @@ -459,12 +459,12 @@ case GPRS_NS2_CS_CREATED: frgre_alloc_vc(bind, nsvc, &saddr, dlci); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; } } else { /* VC found */ - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); } out: msgb_free(msg); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 708eb59..15b0bc5 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -203,8 +203,7 @@ struct msgb **reject, struct gprs_ns2_vc **success); -int ns2_recv_vc(struct gprs_ns2_inst *nsi, - struct gprs_ns2_vc *nsvc, +int ns2_recv_vc(struct gprs_ns2_vc *nsvc, struct msgb *msg); struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 9994a72..2f55f2a 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -195,7 +195,7 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: @@ -208,12 +208,12 @@ case GPRS_NS2_CS_CREATED: ns2_driver_alloc_vc(bind, nsvc, &saddr); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); break; } } else { /* VC found */ - rc = ns2_recv_vc(bind->nsi, nsvc, msg); + rc = ns2_recv_vc(nsvc, msg); } msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 Gerrit-Change-Number: 20268 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:45:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:45:27 +0000 Subject: Change in libosmocore[master]: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20264 ) Change subject: ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found ...................................................................... ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found Fixes the parsing of persistent nsvcs. Change-Id: I297409f557f17df680ac76018b4202eb99713021 --- M src/gb/gprs_ns2_vty.c 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index f204ff1..ab869c3 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -138,20 +138,21 @@ static struct ns2_vty_vc *vtyvc_by_nsei(uint16_t nsei, bool alloc_missing) { struct ns2_vty_vc *vtyvc; + llist_for_each_entry(vtyvc, &priv.vtyvc, list) { if (vtyvc->nsei == nsei) return vtyvc; } - if (alloc_missing) { - vtyvc = vtyvc_alloc(nsei); - if (!vtyvc) - return vtyvc; + if (!alloc_missing) + return NULL; - vtyvc->nsei = nsei; - } + vtyvc = vtyvc_alloc(nsei); + if (!vtyvc) + return vtyvc; - return NULL; + vtyvc->nsei = nsei; + return vtyvc; } static int config_write_ns(struct vty *vty) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I297409f557f17df680ac76018b4202eb99713021 Gerrit-Change-Number: 20264 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:46:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:46:39 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20270 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b Gerrit-Change-Number: 20270 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:46:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:47:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:47:13 +0000 Subject: Change in libosmocore[master]: ns2: fix a msg leak when receiving REJECTED messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20274 ) Change subject: ns2: fix a msg leak when receiving REJECTED messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc53c29c3dd09c395a275ceb8648b8eb19c06c Gerrit-Change-Number: 20274 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:47:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:49:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:49:31 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 09:49:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:50:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:50:46 +0000 Subject: Change in osmo-bts[master]: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20272 ) Change subject: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC for PCU ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1291 PS1, Line 1291: IPPROTO_IPIP why not AF_INET / AF_INET6? https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1302 PS1, Line 1302: nsvc->remote.u.sas.ss_family = AF_INET6; : nsvc->local.u.sas.ss_family = AF_INET; are we sure local shouldn't be AF_INET6? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I310699fabbfec4255f0474f31717f215c1201eca Gerrit-Change-Number: 20272 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:50:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:53:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:53:20 +0000 Subject: Change in osmo-pcu[master]: Use the new NS2 lib In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20271 ) Change subject: Use the new NS2 lib ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20271/1/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20271/1/src/gprs_bssgp_pcu.cpp at 630 PS1, Line 630: struct gprs_ns2_inst *nsi = (struct gprs_ns2_inst *) ctx; : struct osmo_gprs_ns2_prim nsp = {}; : nsp.nsei = msgb_nsei(msg); : nsp.bvci = msgb_bvci(msg); : osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA, : PRIM_OP_REQUEST, msg); : return gprs_ns2_recv_prim(nsi, &nsp.oph); normally I would have expected that the primitive header is pushed onto the msgb itself to form a so-called 'msgb-wrapped osmo_prim'. Any reason to go for a primitive on the stack instaed? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib389925cf5c9f18951af6242c31ea70476218e9a Gerrit-Change-Number: 20271 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:53:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:53:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 09:53:23 +0000 Subject: Change in osmo-bts[master]: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC ... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20272 ) Change subject: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC for PCU ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1291 PS1, Line 1291: case IPPROTO_IPIP: Again, this kind of define being used here makes no sense to me, it's confusing. Let's better use our own define. https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1292 PS1, Line 1292: /* we already checked for 10 bytes */ No TLVP_LEN check here, as done in ipv6? https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1295 PS1, Line 1295: memcpy(&nsvc->remote.u.sin.sin_addr.s_addr, cur, sizeof(in_addr_t)); memcopying into sin_addr and using sizeof(struct sin_addr) is what we usually use, and may be more portable? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I310699fabbfec4255f0474f31717f215c1201eca Gerrit-Change-Number: 20272 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 09:53:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:56:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:56:50 +0000 Subject: Change in osmo-bsc[master]: bssap: Use new DTAP DLCI helper fields from libosmocore In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16260 ) Change subject: bssap: Use new DTAP DLCI helper fields from libosmocore ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib72e2bda46e39d1075e4270ac5fa51df2f418164 Gerrit-Change-Number: 16260 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 25 Sep 2020 09:56:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:56:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:56:53 +0000 Subject: Change in osmo-bsc[master]: bssap: Use new DTAP DLCI helper fields from libosmocore In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16260 ) Change subject: bssap: Use new DTAP DLCI helper fields from libosmocore ...................................................................... bssap: Use new DTAP DLCI helper fields from libosmocore This is the only place where the entire dtap header is passed, where the split between SAPI and CHAN is done. Other places in osmo-bsc pass around a link_id integer containing everything, so leaving that out of the scope for this patch. The gsm0406_dlci_sapi_name() API was introduced in libosmocore 1.3.0, and osmo-bsc currently requires libosmocore 1.4.0, so it means we are not further restricting libosmocore dependency here by using it. Change-Id: Ib72e2bda46e39d1075e4270ac5fa51df2f418164 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 2a199c4..65fee04 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1233,7 +1233,7 @@ } rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_DTAP]); - LOGP(DMSC, LOGL_INFO, "Rx MSC DTAP, SAPI: %u CHAN: %u\n", header->link_id & 0x07, header->link_id & 0xC0); + LOGP(DMSC, LOGL_INFO, "Rx MSC DTAP, SAPI: %s CHAN: %u\n", gsm0406_dlci_sapi_name(header->dlci_sapi), header->dlci_cc); /* forward the data */ gsm48 = gsm48_msgb_alloc_name("GSM 04.08 DTAP RCV"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib72e2bda46e39d1075e4270ac5fa51df2f418164 Gerrit-Change-Number: 16260 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:57:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:57:25 +0000 Subject: Change in osmo-ci[master]: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20255 ) Change subject: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 Gerrit-Change-Number: 20255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 09:57:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:57:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:57:27 +0000 Subject: Change in osmo-ci[master]: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/20255 ) Change subject: build-old-tags-against-master: Ignore some osmo-bts and openbsc versions ...................................................................... build-old-tags-against-master: Ignore some osmo-bts and openbsc versions Some unit tests in those repositories started failing due to a fix in libosmocore logging system where extra coloring tags were printed when not needed. Unit tests in current master of those repositories are fixed to work with both old and new versions of libosmocore since they got coloring disabled in their output, and new patch releases have been done containing the fix, which means last releases already work with both libosmocore version. However, older releases are expected to fail when built against libosmocore master. Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 --- M scripts/osmocom-build-old-tags-against-master.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: pespin: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/osmocom-build-old-tags-against-master.sh b/scripts/osmocom-build-old-tags-against-master.sh index cd05dfb..e0abe8c 100755 --- a/scripts/osmocom-build-old-tags-against-master.sh +++ b/scripts/osmocom-build-old-tags-against-master.sh @@ -52,6 +52,8 @@ case "$1" in openbsc) echo "1.0.0" # testsuite + echo "1.3.1" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc + echo "1.3.2" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc ;; osmo-bsc) # Depends on libosmo-legacy-mgcp, but missing LIBOSMOLEGACYMGCP_CFLAGS so we can't build it with @@ -61,6 +63,8 @@ ;; osmo-bts) echo "1.0.0" # missing gsm0808.h include, fixed in 1.0.1 + echo "1.2.0" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc + echo "1.2.1" # testsuite: libosmocore 6407c822ae0d45d047deb0dff095f028a90c1ecc ;; osmo-mgw) echo "1.3.0" # testsuite -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I03ca926b903a4dcc9967ab5fe455d715cdb9ed45 Gerrit-Change-Number: 20255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:57:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:57:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: bsc: Fix indentation alignment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20256 ) Change subject: cosmetic: bsc: Fix indentation alignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5484784fca254044055a9f131e1ebb19de8ceba5 Gerrit-Change-Number: 20256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:57:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:57:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:57:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: bsc: Fix indentation alignment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20256 ) Change subject: cosmetic: bsc: Fix indentation alignment ...................................................................... cosmetic: bsc: Fix indentation alignment Change-Id: I5484784fca254044055a9f131e1ebb19de8ceba5 --- M bsc/BSC_Tests.ttcn 1 file changed, 28 insertions(+), 28 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0fd0a17..9e0fae3 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3615,57 +3615,57 @@ /* Set S1, we expect an AMR multirate configuration IE with all four rates * set. */ testcase TC_assignment_codec_amr_f_S1() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); + f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); } /* Set S1, we expect an AMR multirate configuration IE with the lower three * rates set. */ testcase TC_assignment_codec_amr_h_S1() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); + f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_f_S124() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); + f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_h_S124() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); + f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); } /* The following block of tests selects more and more rates until all four * possible rates are in the active set (full rate) */ testcase TC_assignment_codec_amr_f_S0() runs on test_CT { - f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); + f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); } testcase TC_assignment_codec_amr_f_S02() runs on test_CT { - f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); + f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); } testcase TC_assignment_codec_amr_f_S024() runs on test_CT { - f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); + f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); } testcase TC_assignment_codec_amr_f_S0247() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); + f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); } /* The following block of tests selects more and more rates until all three * possible rates are in the active set (half rate) */ testcase TC_assignment_codec_amr_h_S0() runs on test_CT { - f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); + f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); } testcase TC_assignment_codec_amr_h_S02() runs on test_CT { - f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); + f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); } testcase TC_assignment_codec_amr_h_S024() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); + f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); } /* The following block tests what happens when the MSC does offer rate @@ -3675,38 +3675,38 @@ * to offer rates that are not applicable anyway. */ testcase TC_assignment_codec_amr_h_S0247() runs on test_CT { - /* Try to include 12,2k in into the active set even though the channel - * is half rate only. The BSC is expected to remove the 12,0k */ - f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); + /* Try to include 12,2k in into the active set even though the channel + * is half rate only. The BSC is expected to remove the 12,0k */ + f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); } testcase TC_assignment_codec_amr_f_S01234567() runs on test_CT { - /* See what happens when all rates are selected at once. Since then - * Also S1 is selected, this setting will be prefered and we should - * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); + /* See what happens when all rates are selected at once. Since then + * Also S1 is selected, this setting will be prefered and we should + * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ + f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); } testcase TC_assignment_codec_amr_f_S0234567() runs on test_CT { - /* Same as above, but with S1 missing, the MSC is then expected to - * select the currently supported rates, which are also 12.2k, 7,40k, - * 5,90k, and 4,75k, into the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); + /* Same as above, but with S1 missing, the MSC is then expected to + * select the currently supported rates, which are also 12.2k, 7,40k, + * 5,90k, and 4,75k, into the active set. */ + f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); } testcase TC_assignment_codec_amr_f_zero() runs on test_CT { - /* Try to select no rates at all */ - f_TC_assignment_codec_amr_fail(true, '00000000'B); + /* Try to select no rates at all */ + f_TC_assignment_codec_amr_fail(true, '00000000'B); } testcase TC_assignment_codec_amr_f_unsupp() runs on test_CT { - /* Try to select only unsupported rates */ - f_TC_assignment_codec_amr_fail(true, '01101000'B); + /* Try to select only unsupported rates */ + f_TC_assignment_codec_amr_fail(true, '01101000'B); } testcase TC_assignment_codec_amr_h_S7() runs on test_CT { - /* Try to select 12,2k for half rate */ - f_TC_assignment_codec_amr_fail(false, '10000000'B); + /* Try to select 12,2k for half rate */ + f_TC_assignment_codec_amr_fail(false, '10000000'B); } private function f_disable_all_tch_f() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5484784fca254044055a9f131e1ebb19de8ceba5 Gerrit-Change-Number: 20256 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:58:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:58:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Call f_shutdown_helper() on all tests missing it In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 ) Change subject: bsc: Call f_shutdown_helper() on all tests missing it ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c8a1061b546576b7a5c4b11f20dfc887aaab6e0 Gerrit-Change-Number: 20257 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:58:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 09:59:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 09:59:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: ACK on SIP failure message to avoid it being retransmitted In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 ) Change subject: sip: ACK on SIP failure message to avoid it being retransmitted ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357 Gerrit-Change-Number: 20258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 09:59:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:00:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:00:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: wait until IPA handshake is done in f_connect_ipa In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20261 ) Change subject: stp: wait until IPA handshake is done in f_connect_ipa ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8ea11fe331baf2b65ce0b7b3c1a2b480332faa2a Gerrit-Change-Number: 20261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 25 Sep 2020 10:00:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:00:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:00:36 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 ) Change subject: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df Gerrit-Change-Number: 20259 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 10:00:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:01:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:01:04 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 10:01:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:01:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:01:36 +0000 Subject: Change in osmo-msc[master]: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20093 ) Change subject: gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() ...................................................................... gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() The function gsm48_rx_cm_reest_req() is the only one where the return code of osmo_mobile_identity_decode_from_l3() is not checked, lets check it here too. Change-Id: I37981205870b094b3a40a20197461208daa62698 Fixes: CID#211037 --- M src/libmsc/gsm_04_08.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 6bd82d0..6379059 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -825,7 +825,12 @@ static int gsm48_rx_cm_reest_req(struct msc_a *msc_a, struct msgb *msg) { struct osmo_mobile_identity mi; - osmo_mobile_identity_decode_from_l3(&mi, msg, false); + int rc = osmo_mobile_identity_decode_from_l3(&mi, msg, false); + if (rc) { + LOGP(DMM, LOGL_ERROR, "CM RE-ESTABLISH REQUEST: cannot decode Mobile Identity\n"); + return -EINVAL; + } + DEBUGP(DMM, "<- CM RE-ESTABLISH REQUEST %s\n", osmo_mobile_identity_to_str_c(OTC_SELECT, &mi)); /* we don't support CM call re-establishment */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37981205870b094b3a40a20197461208daa62698 Gerrit-Change-Number: 20093 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:01:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:01:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Fix Tns-alive/Tns-test expiration detection In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20186 ) Change subject: NS_Emulation: Fix Tns-alive/Tns-test expiration detection ...................................................................... NS_Emulation: Fix Tns-alive/Tns-test expiration detection Change-Id: Icb7d076f57c166b498c1b3edd84edcf13ea9739d --- M library/NS_Emulation.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 0198da8..97a48e5 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -175,19 +175,19 @@ var ASP_Event evt; /* transition to DEAD if t_alive times out */ - [Tns_alive.running] Tns_alive.timeout { - log("Tns-aeive expired: changing to DEAD_BLOCKED + starting Tns-test"); + [] Tns_alive.timeout { + log("Tns-alive expired: changing to DEAD_BLOCKED + starting Tns-test"); f_change_state(NSE_S_DEAD_BLOCKED); Tns_test.start; } - [Tns_test.running] Tns_test.timeout { + [] Tns_test.timeout { log("Tns-test expired: sending NS-ALIVE"); f_sendAlive(); } /* Stop t_alive when receiving ALIVE-ACK */ - [] NSCP.receive(t_NS_ALIVE_ACK) { + [Tns_alive.running] NSCP.receive(t_NS_ALIVE_ACK) { log("NS-ALIVE-ACK received: stopping Tns-alive; starting Tns-test"); Tns_alive.stop; Tns_test.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icb7d076f57c166b498c1b3edd84edcf13ea9739d Gerrit-Change-Number: 20186 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:06:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:06:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Prepare NSConfiguration for non-IP providers 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/c/osmo-ttcn3-hacks/+/20117 to look at the new patch set (#8). Change subject: NS_Emulation: Prepare NSConfiguration for non-IP providers ...................................................................... NS_Emulation: Prepare NSConfiguration for non-IP providers NSConfiguration currently contains parameters relevant only for IP based transport. Move IP/UDP parameters into a sub-structure in anticipation of Frame Relay support. Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 --- M library/NS_Emulation.ttcn M library/NS_Provider_IPL4.ttcn M library/RAW_NS.ttcn M pcu/PCU_Tests.cfg M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_SNS.ttcn M pcu/SGSN_Components.ttcn M sgsn/SGSN_Tests.cfg M sgsn/SGSN_Tests.ttcn 9 files changed, 109 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/20117/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 Gerrit-Change-Number: 20117 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:12:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:12:42 +0000 Subject: Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20270 ) Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read ...................................................................... ns2: refactor handle_nsip_read/handle_nsfrgre_read Might be more readable. Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b --- M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 2 files changed, 6 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 0903e46..e2e0b29 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -446,12 +446,11 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: rc = 0; - break; + goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ frgre_sendmsg(bind, reject, &saddr); @@ -459,13 +458,11 @@ case GPRS_NS2_CS_CREATED: frgre_alloc_vc(bind, nsvc, &saddr, dlci); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(nsvc, msg); break; } - } else { - /* VC found */ - rc = ns2_recv_vc(nsvc, msg); } + + rc = ns2_recv_vc(nsvc, msg); out: msgb_free(msg); diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 2f55f2a..bda0acf 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -195,12 +195,11 @@ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { case GPRS_NS2_CS_FOUND: - rc = ns2_recv_vc(nsvc, msg); break; case GPRS_NS2_CS_ERROR: case GPRS_NS2_CS_SKIPPED: rc = 0; - break; + goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ nsip_sendmsg(bind, reject, &saddr); @@ -208,14 +207,12 @@ case GPRS_NS2_CS_CREATED: ns2_driver_alloc_vc(bind, nsvc, &saddr); gprs_ns2_vc_fsm_start(nsvc); - rc = ns2_recv_vc(nsvc, msg); break; } - } else { - /* VC found */ - rc = ns2_recv_vc(nsvc, msg); } + rc = ns2_recv_vc(nsvc, msg); +out: msgb_free(msg); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b Gerrit-Change-Number: 20270 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:13:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:13:30 +0000 Subject: Change in ...osmo_ss7[master]: ipa_proto: Allow configuring ack initiation behavior In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 ) Change subject: ipa_proto: Allow configuring ack initiation behavior ...................................................................... ipa_proto: Allow configuring ack initiation behavior When the osmo-msc version 1.6.1 connects to the osmo-hlr, it sends an id response and an immediate ack. This commit allows initiating the handshake with an ack rather than an id request (as is done by ipa *clients*, like a bts towards a bsc, or the msc towards the hlr) if needed to mimic behavior of particular components. Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e --- M include/ipa.hrl M src/ipa_proto.erl 2 files changed, 26 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/ipa.hrl b/include/ipa.hrl index 352057f..f0372f4 100644 --- a/include/ipa.hrl +++ b/include/ipa.hrl @@ -26,7 +26,7 @@ unit_type, equipment_version, sw_version, - unit_name - }). + unit_name, + initiate_ack=false}). -endif. diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index e472b6c..d1d4396 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -99,33 +99,35 @@ % unblock the socket from further processing unblock(Socket) -> - send_ccm_id_get(Socket), call_sync_sock(Socket, {ipa_unblock, Socket}). - % server-side handler for unregister_stream() -request({ipa_reg_stream, Socket, StreamID, Pid}) -> +request({ipa_reg_stream, Socket, StreamID, Pid}, _) -> io:format("Registering handler ~p for socket ~p Stream ~p~n", [Pid, Socket, StreamID]), [IpaSock] = ets:lookup(ipa_sockets, Socket), ets:insert_new(IpaSock#ipa_socket.streamTbl, {{Socket, StreamID}, Pid}); % server-side handler for unregister_stream() -request({ipa_unreg_stream, Socket, StreamID}) -> +request({ipa_unreg_stream, Socket, StreamID}, _) -> io:format("Unregistering handler for Socket ~p Stream ~p~n", [Socket, StreamID]), [IpaSock] = ets:lookup(ipa_sockets, Socket), ets:delete(IpaSock#ipa_socket.streamTbl, {Socket, StreamID}); % server-side handler for controlling_process() -request({ipa_ctrl_proc, Socket, StreamID, NewPid}) -> +request({ipa_ctrl_proc, Socket, StreamID, NewPid}, _) -> io:format("Changing handler for socket ~p Stream ~p~n", [Socket, StreamID]), [IpaSock] = ets:lookup(ipa_sockets, Socket), ets:delete(IpaSock#ipa_socket.streamTbl, {Socket, StreamID}), ets:insert_new(IpaSock#ipa_socket.streamTbl, {{Socket, StreamID}, NewPid}); % server-side handler for set_ccm_options() % set ccm protocol metadata options reported with connection setup. -request({ipa_set_ccm_options, Socket, CcmOptions}) -> +request({ipa_set_ccm_options, Socket, CcmOptions}, _) -> io:format("Setting ccm options for socket ~p to ~p~n", [Socket, CcmOptions]), {ccm_options, CcmOptions}; % server-side handler for unblock() -request({ipa_unblock, Socket}) -> +request({ipa_unblock, Socket}, CcmOptions) -> + if + CcmOptions#ipa_ccm_options.initiate_ack -> send_ccm_id_ack(Socket); + true -> send_ccm_id_get(Socket) + end, io:format("Unblocking socket ~p~n", [Socket]), %[IpaSock] = ets:lookup(ipa_sockets, Socket), Ret = inet:setopts(Socket, [{active, once}]), @@ -253,7 +255,7 @@ loop(S, StreamMap, CcmOptions) -> receive {request, From, Request} -> - case ipa_proto:request(Request) of + case ipa_proto:request(Request, CcmOptions) of {ccm_options, NewCcmOptions} -> NextCcmOptions = NewCcmOptions, Reply = ok; @@ -282,10 +284,17 @@ process_ccm_msg(Socket, StreamID, _, ping, _) -> io:format("Socket ~p Stream ~p: PING -> PONG~n", [Socket, StreamID]), send(Socket, StreamID, <>); -% Simply respond to ID_ACK with ID_ACK -process_ccm_msg(Socket, StreamID, _, id_ack, _) -> - io:format("Socket ~p Stream ~p: ID_ACK -> ID_ACK~n", [Socket, StreamID]), - send(Socket, StreamID, <>); +% Respond to ID_ACK with ID_ACK if this instance did not initiate +process_ccm_msg(Socket, StreamID, CcmOptions, id_ack, _) -> + if + CcmOptions#ipa_ccm_options.initiate_ack /= true -> + % Only respond to an ack if this instance did + % not initiate to prevent an infinite ack loop. + io:format("Socket ~p Stream ~p: ID_ACK -> ID_ACK~n", [Socket, StreamID]), + send(Socket, StreamID, <>); + true -> + io:format("Socket ~p Stream ~p: ID_ACK -> None~n", [Socket, StreamID]) + end; % Simply respond to ID_RESP with ID_ACK process_ccm_msg(Socket, StreamID, _, id_resp, _) -> io:format("Socket ~p Stream ~p: ID_RESP -> ID_ACK~n", [Socket, StreamID]), @@ -319,6 +328,9 @@ send_ccm_id_get(Socket) -> send(Socket, ?IPAC_PROTO_CCM, <>). +send_ccm_id_ack(Socket) -> + send(Socket, ?IPAC_PROTO_CCM, <>). + % convenience wrapper for interactive use / debugging from the shell listen_accept_handle(LPort, Opts) -> case gen_tcp:listen(LPort, ?IPA_SOCKOPTS ++ Opts) of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6ab3c9efb51e806f582ce8f473a13ee73ca1567e Gerrit-Change-Number: 20019 Gerrit-PatchSet: 3 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: matt9j Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:13:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 25 Sep 2020 10:13:31 +0000 Subject: Change in ...osmo_ss7[master]: ebin/app: Add missing ipa_proto_ccm module In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20211 ) Change subject: ebin/app: Add missing ipa_proto_ccm module ...................................................................... ebin/app: Add missing ipa_proto_ccm module Commit 0c40c626caa95fd27be5f6af9b0b9f63edb23bb2 introduced a new ipa_proto_ccm module, which was not added to the app module list. Commit 515aa3343442e784602e23890672e40eb320aa00 then used a function from this module. In interactive mode the module would be loaded automatically so its omission was not detected in testing. In embedded mode (used by default in relx releases) modules are loaded statically on startup and must be explicitly listed. Change-Id: I5b7338341a9e179b41b8f2f092efe9aaf83451bb --- M ebin/osmo_ss7.app 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ebin/osmo_ss7.app b/ebin/osmo_ss7.app index 6eeceb2..be92ae3 100644 --- a/ebin/osmo_ss7.app +++ b/ebin/osmo_ss7.app @@ -3,6 +3,7 @@ {vsn, "1"}, {modules, [ osmo_util, ipa_proto, + ipa_proto_ccm, sctp_core, bssmap_codec, isup_codec, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/20211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I5b7338341a9e179b41b8f2f092efe9aaf83451bb Gerrit-Change-Number: 20211 Gerrit-PatchSet: 1 Gerrit-Owner: matt9j Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:48:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 10:48:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Prepare NSConfiguration for non-IP providers In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 ) Change subject: NS_Emulation: Prepare NSConfiguration for non-IP providers ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 Gerrit-Change-Number: 20117 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 10:48:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:49:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 10:49:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Add [optional] support for FrameRelay transport In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118 ) Change subject: NS_Emulation: Add [optional] support for FrameRelay transport ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118/10/library/NS_Provider_FR.ttcn File library/NS_Provider_FR.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118/10/library/NS_Provider_FR.ttcn at 44 PS10, Line 44: var FrameRelayFrame rx_fr; indentation- -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42ca811d23e383e362d2527c8ff2c916a62a5b42 Gerrit-Change-Number: 20118 Gerrit-PatchSet: 10 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 10:49:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:51:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 10:51:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Introduce status events from provider -> emulation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20122 ) Change subject: NS_Emulation: Introduce status events from provider -> emulation ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If00e9c50dc664ce62b6c0cbde99d741e8173169b Gerrit-Change-Number: 20122 Gerrit-PatchSet: 9 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 10:51:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 10:52:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 10:52:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: pass around string idenifier for components created In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128 ) Change subject: NS_Emulation: pass around string idenifier for components created ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0fe650243953e4d85161684865acd0354b2e465f Gerrit-Change-Number: 20128 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Comment-Date: Fri, 25 Sep 2020 10:52:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 11:02:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 11:02:48 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 3: (8 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bsc_vty.c at 3043 PS3, Line 3043: ret = osmo_sockaddr_str_from_str2(&remote, argv[1]); You could probably simply use osmo_ip_str_type() and feet address_family to the switch statement below. https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts.c at 232 PS3, Line 232: LOGP(DLINP, LOGL_ERROR, "BTS %d does not support IPv6 but require it!\n", bts->nr); this err string is confusing. Better "but an IPv6 address was configured". https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 206 PS3, Line 206: if (bts->gprs.nsvc->remote.u.sa.sa_family == AF_INET6) { switch? https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 208 PS3, Line 208: osmo_store16be(IPPROTO_IPV6, &buf[0]); Please let's use our own define here, not this define which was nothing to do. That's for IPoverIP. https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 212 PS3, Line 212: memcpy(&buf[4], &bts->gprs.nsvc[0].remote.u.sin6.sin6_port, sizeof(uint16_t)); Really? memcpy for a uint16_t? https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 218 PS3, Line 218: memcpy(&buf[0], &bts->gprs.nsvc[0].remote.u.sin.sin_port, sizeof(uint16_t)); Same https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/pcu_sock.c File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/pcu_sock.c at 199 PS3, Line 199: LOGP(DPCU, LOGL_ERROR, "Can not encode IPv6 NSVC!"); didn't fixeria already add support for it? https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/pcu_sock.c at 205 PS3, Line 205: info_ind->nsvci[i] = nsvc->nsvci; You should have 2 iter variable shere, otherwise if you "continue;" above, you end up with holes in the struct. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 11:02:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 11:02:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 11:02:55 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 3: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 11:02:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 12:29:04 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 12:29:04 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: Hello fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/20228 to look at the new patch set (#2). Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... ttcn3-pcu-test: Change config to support statsd Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Depends: osmo-ttcn3-hacks.git Change-Id I90964b32fa11ed2582afc5fb56bd302b06606f86 Related: SYS#4877 --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/osmo-pcu.cfg 4 files changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/28/20228/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 12:30:52 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 12:30:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 12:30:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 12:31:36 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 12:31:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check stats for pcu channel allocation, bytes transferred In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 ) Change subject: pcu: Check stats for pcu channel allocation, bytes transferred ...................................................................... pcu: Check stats for pcu channel allocation, bytes transferred Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Related: SYS#4877 --- M pcu/PCU_Tests.default M pcu/PCU_Tests.ttcn M pcu/gen_links.sh M pcu/osmo-pcu.cfg M pcu/regen_makefile.sh 5 files changed, 64 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index db4bd58..fde1c79 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -23,6 +23,7 @@ } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; PCUIF_Types.mp_pcuif_version := 10; +StatsD_Checker.mp_enable_stats := true; [TESTPORT_PARAMETERS] *.PCU.socket_type := "SEQPACKET" @@ -35,6 +36,15 @@ *.PCUVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.PCUVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.PCUVTY.PROMPT1 := "OsmoPCU> " +*.STATSVTY.CTRL_MODE := "client" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.1" +*.STATSVTY.CTRL_PORTNUM := "4240" +*.STATSVTY.CTRL_LOGIN_SKIPPED := "yes" +*.STATSVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.STATSVTY.CTRL_READMODE := "buffered" +*.STATSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.STATSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.STATSVTY.PROMPT1 := "OsmoPCU> " [MAIN_CONTROLLER] diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 142cdcd..0bd7093 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -51,10 +51,18 @@ import from SGSN_Components all; import from GPRS_Components all; +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + modulepar { charstring mp_pcu_sock_path := PCU_SOCK_DEFAULT; float X2002 := 0.2; /* Timer -2002, IMM ASSIGN confirm delay */ + + charstring mp_pcu_statsd_ip := "127.0.0.1"; + integer mp_pcu_statsd_port := 8125; } @@ -102,10 +110,13 @@ uint8_t high } -type component RAW_PCU_Test_CT extends bssgp_CT, MS_BTS_IFACE_CT { +type component RAW_PCU_Test_CT extends bssgp_CT, MS_BTS_IFACE_CT, StatsD_ConnHdlr { /* PCU interface abstraction component */ var RAW_PCUIF_CT vc_PCUIF; + /* StatsD */ + var StatsD_Checker_CT vc_STATSD; + /* Connection to the PCUIF component */ port RAW_PCU_MSG_PT PCUIF; /* VTY connection to the PCU */ @@ -215,6 +226,11 @@ f_init_vty(id); + f_init_statsd(id, vc_STATSD, mp_pcu_statsd_ip, mp_pcu_statsd_port); + /* This is normally done in the ConnHdlr component, but here + * the Test_CT doubles as ConnHdlr */ + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + vc_PCUIF.start(f_PCUIF_CT_handler(mp_pcu_sock_path)); vc_BTS.start(f_BTS_CT_handler(0, valueof(info_ind))); @@ -1437,6 +1453,8 @@ /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); + f_statsd_reset(); + /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); @@ -1486,6 +1504,17 @@ /* Make sure that the next block (after the Ack) is dummy */ f_rx_rlcmac_dl_block_exp_dummy(dl_block); + var StatsDExpects expect := { + { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 0, max := 0}, + { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.immediate.assignment_UL", mtype := "c", min := 0, max := 0}, + { name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 0, max := 0}, + { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min := 112, max := 112}, + { name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 0, max := 0} + }; + f_statsd_expect(expect); + f_shutdown(__BFILE__, __LINE__, final := true); } @@ -1849,6 +1878,8 @@ /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); + f_statsd_reset(); + /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); @@ -1878,6 +1909,16 @@ f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc), f_dl_block_ack_fn(dl_block, dl_fn)); + var StatsDExpects expect := { + { name := "TTCN3.bts.0.rach.requests", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.immediate.assignment_DL", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.tbf.dl.alloc", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.tbf.ul.alloc", mtype := "c", min := 1, max := 1}, + { name := "TTCN3.bts.0.rlc.dl_payload_bytes", mtype := "c", min := 28, max := 28}, + { name := "TTCN3.bts.0.rlc.ul_payload_bytes", mtype := "c", min := 16, max := 16} + }; + f_statsd_expect(expect); + f_shutdown(__BFILE__, __LINE__, final := true); } diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index 8b87e18..fbb79a0 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -50,6 +50,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " FILES+="NS_Provider_IPL4.ttcn NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " diff --git a/pcu/osmo-pcu.cfg b/pcu/osmo-pcu.cfg index d6213b5..12dc577 100644 --- a/pcu/osmo-pcu.cfg +++ b/pcu/osmo-pcu.cfg @@ -9,6 +9,16 @@ logging print file basename last logging print extended-timestamp 1 logging level set-all debug +! +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable line vty no login diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index b2063ac..dc9b672 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc" +FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc" export CPPFLAGS_TTCN3="-DBSSGP_EM_L3" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90964b32fa11ed2582afc5fb56bd302b06606f86 Gerrit-Change-Number: 20226 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 12:34:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 12:34:43 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 12:34:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 12:48:24 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 12:48:24 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 12:48:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 12:58:41 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 12:58:41 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 12:58:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 12:58:44 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 12:58:44 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 ) Change subject: ttcn3-pcu-test: Change config to support statsd ...................................................................... ttcn3-pcu-test: Change config to support statsd Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Depends: osmo-ttcn3-hacks.git Change-Id I90964b32fa11ed2582afc5fb56bd302b06606f86 Related: SYS#4877 --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/osmo-pcu.cfg 4 files changed, 26 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved; Verified diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 92f5d8a..89c997e 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -7,9 +7,13 @@ [TESTPORT_PARAMETERS] *.PCUVTY.CTRL_HOSTNAME := "172.18.13.101" *.PCUVTY.PROMPT1 := "OsmoPCU> " +*.STATSVTY.CTRL_HOSTNAME := "172.18.13.101" +*.STATSVTY.PROMPT1 := "OsmoPCU> " + [MODULE_PARAMETERS] PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts" +PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10" SGSN_Components.mp_nsconfig := { address_family := AF_INET, local_ip := "172.18.13.10", @@ -20,6 +24,7 @@ nsei := 1234 } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 8930885..ebc0614 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -24,6 +24,11 @@ # PCUIFv10 is not yet supported in the latest release sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" + + # Disable stats testing until libosmocore release > 1.4.0 + sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg + sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg + sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg fi echo Starting container with PCU diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 3e0d816..5701c2c 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -24,6 +24,11 @@ # PCUIFv10 is not yet supported in the latest release sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" + + # Disable stats testing until libosmocore release > 1.4.0 + sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg + sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg + sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg fi echo Starting container with PCU diff --git a/ttcn3-pcu-test/osmo-pcu.cfg b/ttcn3-pcu-test/osmo-pcu.cfg index 326ad59..733cebe 100644 --- a/ttcn3-pcu-test/osmo-pcu.cfg +++ b/ttcn3-pcu-test/osmo-pcu.cfg @@ -11,7 +11,17 @@ logging print file basename last logging print extended-timestamp 1 logging level set-all debug - +! +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 172.18.13.10 + remote-port 8125 + flush-period 1 + mtu 1024 + enable +! line vty no login bind 172.18.13.101 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691 Gerrit-Change-Number: 20228 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 13:22:13 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 25 Sep 2020 13:22:13 +0000 Subject: Change in docker-playground[master]: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20275 ) Change subject: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Gerrit-Change-Number: 20275 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 13:22:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 13:22:38 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 25 Sep 2020 13:22:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: allow to use IPV4 as default In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 ) Change subject: MSC_ConnectionHandler: allow to use IPV4 as default ...................................................................... Patch Set 3: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232/1/bsc/MSC_ConnectionHandler.ttcn File bsc/MSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232/1/bsc/MSC_ConnectionHandler.ttcn at 282 PS1, Line 282: var charstring local_rtp_addr := host_mgw_rtp_v4; /* Use IPv4 by default if no remote addr is provided by client */ > That's going to break in ttcn3-bsc-master. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c Gerrit-Change-Number: 20232 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 13:22:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 13:48:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 13:48:49 +0000 Subject: Change in docker-playground[master]: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20275 ) Change subject: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Gerrit-Change-Number: 20275 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 13:48:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 13:49:36 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 25 Sep 2020 13:49:36 +0000 Subject: Change in osmo-bts[master]: sched_lchan_tchh: initialize meas_avg with zeros References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20282 ) Change subject: sched_lchan_tchh: initialize meas_avg with zeros ...................................................................... sched_lchan_tchh: initialize meas_avg with zeros in function rx_tchh_fn() the variable meas_avg is not initalized. This is not always a problem, since most of the time trx_sched_meas_avg() is populating the variable properly. In cases where a FACCH is transmitted (chan_state->ul_ongoing_facch = true) the variable is left unpopulated. In order to have at least stable values for those cases, make sure that meas_avg contains zeros in the beginning. Change-Id: I5c3c1c41d22f9edaaf6bd4478dd04f090dca12a9 Fixes: CID#214480 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/20282/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 2a561e1..75aeec4 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -66,7 +66,7 @@ */ int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_QUAD; - struct l1sched_meas_set meas_avg; + struct l1sched_meas_set meas_avg = { }; unsigned int fn_begin; uint16_t ber10k; uint8_t is_sub = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c3c1c41d22f9edaaf6bd4478dd04f090dca12a9 Gerrit-Change-Number: 20282 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 15:56:23 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 15:56:23 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Make reason const References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20283 ) Change subject: gprs_ns2: Make reason const ...................................................................... gprs_ns2: Make reason const Change-Id: Ia0db18703d9fd137a5c5fe4474e2d76868a9af9d --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2_vty.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/20283/1 diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index cd2de96..6b88c72 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -153,7 +153,7 @@ /* vty */ int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi); int gprs_ns2_vty_create(); -void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, char *reason); +void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, const char *reason); /*! @} */ diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index ab869c3..9deb3a1 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -60,7 +60,7 @@ /* force vc mode if another configuration forces * the vc mode. E.g. SNS configuration */ bool force_vc_mode; - char *force_vc_mode_reason; + const char *force_vc_mode_reason; bool frgre; struct llist_head vtyvc; @@ -826,7 +826,7 @@ * \param mode * \param reason A description shown to the user when a vty command wants to change the mode. */ -void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, char *reason) +void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, const char *reason) { priv.force_vc_mode = force; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia0db18703d9fd137a5c5fe4474e2d76868a9af9d Gerrit-Change-Number: 20283 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 16:12:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 16:12:00 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Make reason const In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20283 ) Change subject: gprs_ns2: Make reason const ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia0db18703d9fd137a5c5fe4474e2d76868a9af9d Gerrit-Change-Number: 20283 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 16:12:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 17:35:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 17:35:11 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Make reason const In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20283 ) Change subject: gprs_ns2: Make reason const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia0db18703d9fd137a5c5fe4474e2d76868a9af9d Gerrit-Change-Number: 20283 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 17:35:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 17:37:49 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 25 Sep 2020 17:37:49 +0000 Subject: Change in libosmocore[master]: gprs_ns2: Make reason const In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20283 ) Change subject: gprs_ns2: Make reason const ...................................................................... gprs_ns2: Make reason const Change-Id: Ia0db18703d9fd137a5c5fe4474e2d76868a9af9d --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2_vty.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index cd2de96..6b88c72 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -153,7 +153,7 @@ /* vty */ int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi); int gprs_ns2_vty_create(); -void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, char *reason); +void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, const char *reason); /*! @} */ diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index ab869c3..9deb3a1 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -60,7 +60,7 @@ /* force vc mode if another configuration forces * the vc mode. E.g. SNS configuration */ bool force_vc_mode; - char *force_vc_mode_reason; + const char *force_vc_mode_reason; bool frgre; struct llist_head vtyvc; @@ -826,7 +826,7 @@ * \param mode * \param reason A description shown to the user when a vty command wants to change the mode. */ -void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, char *reason) +void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, const char *reason) { priv.force_vc_mode = force; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia0db18703d9fd137a5c5fe4474e2d76868a9af9d Gerrit-Change-Number: 20283 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 17:54:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 17:54:32 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20284 ) Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Introduce NM operative state Radio Carrier FSM All the Operative State logic to manage a RadioCarrier NM object is centralized in this FSM, where other parts of the code simply send events to it. This allows keeping state consistent and offloading logic from each bts backend, since they are only required to submit events now. The idea in the long run is to also replace other NM objects with similar FSMs. This improved logic fixes bug where PHY + RSL link became available before OPSTART and hence op state changed to Enabled before receiving any OPSTART message. Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts_trx.h A include/osmo-bts/nm_radio_carrier_fsm.h M src/common/Makefile.am M src/common/bts_trx.c A src/common/nm_radio_carrier_fsm.c M src/common/phy_link.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 18 files changed, 354 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20284/1 diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index cdbaa4f..0a758c6 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -27,4 +27,5 @@ phy_link.h \ dtx_dl_amr_fsm.h \ ta_control.h \ + nm_radio_carrier_fsm.h \ $(NULL) diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index ce2d4d4..a4c2d37 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -16,6 +16,9 @@ uint8_t rsl_tei; struct e1inp_sign_link *rsl_link; + /* NM Radio Carrier and Baseband Transciever FSM */ + struct osmo_fsm_inst *nm_rcarrier_fi; + bool opstart_success; /* OPSTART went OK in lower layers and was acked */ struct gsm_abis_mo mo; struct { struct gsm_abis_mo mo; diff --git a/include/osmo-bts/nm_radio_carrier_fsm.h b/include/osmo-bts/nm_radio_carrier_fsm.h new file mode 100644 index 0000000..1b4b269 --- /dev/null +++ b/include/osmo-bts/nm_radio_carrier_fsm.h @@ -0,0 +1,45 @@ +/* NM Radio Carrier FSM. Following 3GPP TS 12.21 Figure 2/GSM 12.21: + GSM 12.21 Objects' Operational state and availability status behaviour during initialization */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU 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 + +enum nm_rcarrier_op_fsm_states { + NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED, + NM_RCARRIER_ST_OP_DISABLED_OFFLINE, + NM_RCARRIER_ST_OP_ENABLED, +}; + +enum nm_radio_carrier_op_fsm_events { + NM_RCARRIER_EV_SW_ACT, + NM_RCARRIER_EV_OPSTART_ACK, + NM_RCARRIER_EV_OPSTART_NACK, + NM_RCARRIER_EV_RSL_UP, + NM_RCARRIER_EV_RSL_DOWN, + NM_RCARRIER_EV_PHYLINK_UP, + NM_RCARRIER_EV_PHYLINK_DOWN, + NM_RCARRIER_EV_DISABLE, +}; + +extern struct osmo_fsm nm_rcarrier_fsm; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index e3a72dc..eea6284 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -37,6 +37,7 @@ dtx_dl_amr_fsm.c \ scheduler_mframe.c \ ta_control.c \ + nm_radio_carrier_fsm.c \ $(NULL) libl1sched_a_SOURCES = scheduler.c diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 93e15c3..1c5fb98 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -17,6 +17,8 @@ * */ +#include + #include #include @@ -26,6 +28,7 @@ #include #include #include +#include struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { @@ -38,6 +41,10 @@ trx->bts = bts; trx->nr = bts->num_trx++; + trx->nm_rcarrier_fi = osmo_fsm_inst_alloc(&nm_rcarrier_fsm, trx, trx, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(trx->nm_rcarrier_fi, "bts%d-trx%d", bts->nr, trx->nr); + gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, bts->nr, trx->nr, 0xff); @@ -161,7 +168,7 @@ LOGPTRX(trx, DSUM, LOGL_INFO, "RSL link %s\n", link ? "up" : "down"); - trx_operability_update(trx); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, link ? NM_RCARRIER_EV_RSL_UP : NM_RCARRIER_EV_RSL_DOWN, NULL); if (link) rc = rsl_tx_rf_res(trx); @@ -177,22 +184,6 @@ return 0; } -/* set the availability of the TRX based on internal state (RSL + phy link) */ -void trx_operability_update(struct gsm_bts_trx *trx) -{ - enum abis_nm_op_state op_st; - enum abis_nm_avail_state avail_st; - struct phy_instance *pinst = trx_phy_instance(trx); - - op_st = (trx->rsl_link && phy_link_state_get(pinst->phy_link) == PHY_LINK_CONNECTED) ? - NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; - avail_st = (op_st == NM_OPSTATE_ENABLED) ? NM_AVSTATE_OK : NM_AVSTATE_NOT_INSTALLED; - - LOGPTRX(trx, DSUM, LOGL_INFO, "Setting operative = %s\n", abis_nm_opstate_name(op_st)); - oml_mo_state_chg(&trx->mo, op_st, avail_st); - oml_mo_state_chg(&trx->bb_transc.mo, -1, avail_st); -} - bool trx_ms_pwr_ctrl_is_osmo(const struct gsm_bts_trx *trx) { diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c new file mode 100644 index 0000000..f05e9ac --- /dev/null +++ b/src/common/nm_radio_carrier_fsm.c @@ -0,0 +1,215 @@ +/* NM Radio Carrier FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU 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 +#include +#include +#include +#include +#include + +#define X(s) (1 << (s)) + +#define nm_rcarrier_fsm_state_chg(fi, NEXT_STATE) \ + osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0) + +////////////////////////// +// FSM STATE ACTIONS +////////////////////////// + +static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + trx->opstart_success = false; + oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); +} + +static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + + switch (event) { + case NM_RCARRIER_EV_SW_ACT: + oml_mo_tx_sw_act_rep(&trx->mo); + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); + return; + case NM_RCARRIER_EV_RSL_UP: + return; + case NM_RCARRIER_EV_RSL_DOWN: + return; + case NM_RCARRIER_EV_PHYLINK_UP: + return; + case NM_RCARRIER_EV_PHYLINK_DOWN: + return; + case NM_RCARRIER_EV_DISABLE: + return; + default: + OSMO_ASSERT(0); + } +} + +static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + trx->opstart_success = false; + oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OFF_LINE); +} + +static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + struct phy_instance *pinst = trx_phy_instance(trx); + struct phy_link *plink = pinst->phy_link; + + switch (event) { + case NM_RCARRIER_EV_OPSTART_ACK: + trx->opstart_success = true; + oml_mo_opstart_ack(&trx->mo); + break; /* check statechg below */ + case NM_RCARRIER_EV_OPSTART_NACK: + trx->opstart_success = false; + oml_mo_opstart_nack(&trx->mo, (int)(intptr_t)data); + return; + case NM_RCARRIER_EV_RSL_UP: + break; /* check statechg below */ + case NM_RCARRIER_EV_RSL_DOWN: + return; + case NM_RCARRIER_EV_PHYLINK_UP: + break; /* check statechg below */ + case NM_RCARRIER_EV_PHYLINK_DOWN: + return; + case NM_RCARRIER_EV_DISABLE: + return; + default: + OSMO_ASSERT(0); + } + + if (trx->rsl_link && (phy_link_state_get(plink) == PHY_LINK_CONNECTED) && + trx->opstart_success) { + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_ENABLED); + } else { + LOGPFSML(fi, LOGL_INFO, "Delay switch to operative state Enabled, wait for:%s%s%s\n", + trx->rsl_link ? "": " rsl", + (phy_link_state_get(plink) == PHY_LINK_CONNECTED) ? "": " phy", + trx->opstart_success ? "": " opstart"); + + } +} + +static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + oml_mo_state_chg(&trx->mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); +} + +static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case NM_RCARRIER_EV_RSL_DOWN: + break; + case NM_RCARRIER_EV_PHYLINK_DOWN: + break; + case NM_RCARRIER_EV_DISABLE: + break; + default: + OSMO_ASSERT(0); + } + + nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); +} + +static struct osmo_fsm_state nm_rcarrier_fsm_states[] = { + [NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED] = { + .in_event_mask = + X(NM_RCARRIER_EV_SW_ACT) | + X(NM_RCARRIER_EV_RSL_UP) | + X(NM_RCARRIER_EV_RSL_DOWN) | + X(NM_RCARRIER_EV_PHYLINK_UP) | + X(NM_RCARRIER_EV_PHYLINK_DOWN), + .out_state_mask = + X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE), + .name = "DISABLED_NOTINSTALLED", + .onenter = st_op_disabled_notinstalled_on_enter, + .action = st_op_disabled_notinstalled, + }, + [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { + .in_event_mask = + X(NM_RCARRIER_EV_OPSTART_ACK) | + X(NM_RCARRIER_EV_OPSTART_NACK) | + X(NM_RCARRIER_EV_RSL_UP) | + X(NM_RCARRIER_EV_RSL_DOWN) | + X(NM_RCARRIER_EV_PHYLINK_UP) | + X(NM_RCARRIER_EV_PHYLINK_DOWN), + .out_state_mask = + X(NM_RCARRIER_ST_OP_ENABLED), + .name = "DISABLED_OFFLINE", + .onenter = st_op_disabled_offline_on_enter, + .action = st_op_disabled_offline, + }, + [NM_RCARRIER_ST_OP_ENABLED] = { + .in_event_mask = + X(NM_RCARRIER_EV_RSL_DOWN) | + X(NM_RCARRIER_EV_PHYLINK_DOWN), + .out_state_mask = + X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE), + .name = "ENABLED", + .onenter = st_op_enabled_on_enter, + .action = st_op_enabled, + }, +}; + +const struct value_string nm_rcarrier_fsm_event_names[] = { + { NM_RCARRIER_EV_SW_ACT, "SW_ACT" }, + { NM_RCARRIER_EV_OPSTART_ACK, "OPSTART_ACK" }, + { NM_RCARRIER_EV_OPSTART_NACK, "OPSTART_NACK" }, + { NM_RCARRIER_EV_RSL_UP, "RSL_UP" }, + { NM_RCARRIER_EV_RSL_DOWN, "RSL_DOWN" }, + { NM_RCARRIER_EV_PHYLINK_UP, "PHYLINK_UP" }, + { NM_RCARRIER_EV_PHYLINK_DOWN, "PHYLINK_DOWN" }, + { NM_RCARRIER_EV_DISABLE, "DISABLE" }, + { 0, NULL } +}; + +struct osmo_fsm nm_rcarrier_fsm = { + .name = "NM_RCARRIER_OP", + .states = nm_rcarrier_fsm_states, + .num_states = ARRAY_SIZE(nm_rcarrier_fsm_states), + .event_names = nm_rcarrier_fsm_event_names, + .log_subsys = DOML, +}; + +static __attribute__((constructor)) void nm_rcarrier_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&nm_rcarrier_fsm) == 0); +} diff --git a/src/common/phy_link.c b/src/common/phy_link.c index d13d3f1..2616b70 100644 --- a/src/common/phy_link.c +++ b/src/common/phy_link.c @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -9,6 +10,7 @@ #include #include #include +#include static LLIST_HEAD(g_phy_links); @@ -65,7 +67,10 @@ if (!trx) continue; - trx_operability_update(trx); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, + state == PHY_LINK_CONNECTED ? NM_RCARRIER_EV_PHYLINK_UP : + NM_RCARRIER_EV_PHYLINK_DOWN, + NULL); } } diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 23f7c3d..60293aa 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -1271,7 +1272,7 @@ /* signal availability */ oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); - oml_mo_tx_sw_act_rep(&trx->mo); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_SW_ACT, NULL); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c index f14f808..e5f6404 100644 --- a/src/osmo-bts-litecell15/oml.c +++ b/src/osmo-bts-litecell15/oml.c @@ -268,17 +268,26 @@ { GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_Status_t status = prim_status(l1p); + struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr); if (status != GsmL1_Status_Success) { LOGP(DL1C, LOGL_ERROR, "Rx %s, status: %s\n", get_value_string(lc15bts_l1prim_names, l1p->id), get_value_string(lc15bts_l1status_names, status)); msgb_free(l1_msg); - return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); + if (mo->obj_class == NM_OC_RADIO_CARRIER) + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_NACK, + (void*)(intptr_t)NM_NACK_CANT_PERFORM); + else + return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); } msgb_free(l1_msg); + /* We already have a FSM for Radio Carrier, handle it there */ + if (mo->obj_class == NM_OC_RADIO_CARRIER) + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + /* Set to Operational State: Enabled */ oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); @@ -390,8 +399,9 @@ ARRAY_SIZE(trx_rqd_attr))) { /* HACK: spec says we need to decline, but openbsc * doesn't deal with this very well */ - return oml_mo_opstart_ack(&trx->mo); - //return oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + //return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_NACK, + // (void*)(intptr_t)NM_NACK_CANT_PERFORM); } /* Update TRX band */ diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c index 8e48674..be044b9 100644 --- a/src/osmo-bts-oc2g/l1_if.c +++ b/src/osmo-bts-oc2g/l1_if.c @@ -1324,8 +1324,7 @@ bts_update_status(BTS_STATUS_RF_ACTIVE, 1); /* signal availability */ - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); - oml_mo_tx_sw_act_rep(&trx->mo); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_SW_ACT, NULL); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index f9faacf..13a4ed2 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -274,11 +274,19 @@ get_value_string(oc2gbts_l1prim_names, l1p->id), get_value_string(oc2gbts_l1status_names, status)); msgb_free(l1_msg); - return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); + if (mo->obj_class == NM_OC_RADIO_CARRIER) + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_NACK, + (void*)(intptr_t)NM_NACK_CANT_PERFORM); + else + return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); } msgb_free(l1_msg); + /* We already have a FSM for Radio Carrier, handle it there */ + if (mo->obj_class == NM_OC_RADIO_CARRIER) + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + /* Set to Operational State: Enabled */ oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index c03b411..d8ba899 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -44,6 +45,7 @@ #include #include #include +#include #include "l1_if.h" #include "l1_oml.h" @@ -311,8 +313,7 @@ int i; if (on) { /* signal availability */ - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); - oml_mo_tx_sw_act_rep(&trx->mo); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_SW_ACT, NULL); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 300d618..6aabdc7 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -38,6 +39,7 @@ #include #include #include +#include #include "l1_if.h" #include "l1_oml.h" @@ -186,6 +188,11 @@ static int opstart_compl(struct gsm_abis_mo *mo) { /* TODO: Send NACK in case of error! */ + struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr); + + /* We already have a FSM for Radio Carrier, handle it there */ + if (mo->obj_class == NM_OC_RADIO_CARRIER) + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); /* Set to Operational State: Enabled */ oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); @@ -1437,8 +1444,9 @@ ARRAY_SIZE(trx_rqd_attr))) { /* HACK: spec says we need to decline, but openbsc * doesn't deal with this very well */ - return oml_mo_opstart_ack(&trx->mo); - /* return oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); */ + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + //return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_NACK, + // (void*)(intptr_t)NM_NACK_CANT_PERFORM); } l1if_check_app_version(trx); diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 311b640..5b18775 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -34,6 +35,7 @@ #include #include #include +#include /* TODO: check if dummy method is sufficient, else implement */ int bts_model_lchan_deactivate(struct gsm_lchan *lchan) @@ -77,14 +79,13 @@ uint8_t tn; llist_for_each_entry(trx, &bts->trx_list, list) { - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); for (tn = 0; tn < TRX_NR_TS; tn++) oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); /* report availability of trx to the bts. this will trigger the rsl connection */ - oml_mo_tx_sw_act_rep(&trx->mo); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_SW_ACT, NULL); oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); } return 0; @@ -125,9 +126,13 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { int rc; + struct gsm_bts_trx* trx; switch (mo->obj_class) { case NM_OC_RADIO_CARRIER: + trx = (struct gsm_bts_trx*) obj; + rc = osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + break; case NM_OC_CHANNEL: case NM_OC_SITE_MANAGER: case NM_OC_BASEB_TRANSC: diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 2e5e5b6..4040bc9 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -1240,8 +1241,7 @@ bts_update_status(BTS_STATUS_RF_ACTIVE, 1); /* signal availability */ - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); - oml_mo_tx_sw_act_rep(&trx->mo); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_SW_ACT, NULL); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 472a7ae..0a5c8b5 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -39,6 +40,7 @@ #include #include #include +#include #include "l1_if.h" #include "femtobts.h" @@ -267,17 +269,26 @@ { GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_Status_t status = prim_status(l1p); + struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr); if (status != GsmL1_Status_Success) { LOGP(DL1C, LOGL_ERROR, "Rx %s, status: %s\n", get_value_string(femtobts_l1prim_names, l1p->id), get_value_string(femtobts_l1status_names, status)); msgb_free(l1_msg); - return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); + if (mo->obj_class == NM_OC_RADIO_CARRIER) + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_NACK, + (void*)(intptr_t)NM_NACK_CANT_PERFORM); + else + return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); } msgb_free(l1_msg); + /* We already have a FSM for Radio Carrier, handle it there */ + if (mo->obj_class == NM_OC_RADIO_CARRIER) + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + /* Set to Operational State: Enabled */ oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); @@ -394,8 +405,9 @@ ARRAY_SIZE(trx_rqd_attr))) { /* HACK: spec says we need to decline, but openbsc * doesn't deal with this very well */ - return oml_mo_opstart_ack(&trx->mo); - //return oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + //return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_NACK, + // (void*)(intptr_t)NM_NACK_CANT_PERFORM); } femto_band = sysmobts_select_femto_band(trx, trx->arfcn); diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index bd3661c..575b5ba 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -44,6 +44,7 @@ #include #include #include +#include #include "l1_if.h" #include "trx_if.h" @@ -96,10 +97,9 @@ * transceiver */ if (avail) { /* signal availability */ - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); if (!pinst->u.osmotrx.sw_act_reported) { - oml_mo_tx_sw_act_rep(&trx->mo); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_SW_ACT, NULL); oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); pinst->u.osmotrx.sw_act_reported = true; } @@ -110,8 +110,7 @@ NM_AVSTATE_DEPENDENCY : NM_AVSTATE_NOT_INSTALLED); } else { - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, - NM_AVSTATE_OFF_LINE); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_DISABLE, NULL); oml_mo_state_chg(&trx->bb_transc.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); @@ -202,13 +201,14 @@ rc = osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true); if (rc != 0) - return oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_NACK, + (void*)(intptr_t)NM_NACK_CANT_PERFORM); if (trx == trx->bts->c0) lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); /* Send OPSTART ack */ - return oml_mo_opstart_ack(&trx->mo); + return osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); } /* Deact RF on transceiver */ diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index dfce81f..1c80eca 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -34,6 +35,7 @@ #include #include #include +#include #include "virtual_um.h" @@ -84,14 +86,13 @@ uint8_t tn; llist_for_each_entry(trx, &bts->trx_list, list) { - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); for (tn = 0; tn < TRX_NR_TS; tn++) oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); /* report availability of trx to the bts. this will trigger the rsl connection */ - oml_mo_tx_sw_act_rep(&trx->mo); + osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_SW_ACT, NULL); oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); } return 0; @@ -139,9 +140,13 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { int rc; + struct gsm_bts_trx* trx; switch (mo->obj_class) { case NM_OC_RADIO_CARRIER: + trx = (struct gsm_bts_trx*) obj; + rc = osmo_fsm_inst_dispatch(trx->nm_rcarrier_fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + break; case NM_OC_CHANNEL: case NM_OC_SITE_MANAGER: case NM_OC_BASEB_TRANSC: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 18:09:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 25 Sep 2020 18:09:55 +0000 Subject: Change in osmo-bts[master]: sched_lchan_tchh: initialize meas_avg with zeros In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20282 ) Change subject: sched_lchan_tchh: initialize meas_avg with zeros ...................................................................... Patch Set 1: Code-Review+1 Will take a deeper look tomorrow. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c3c1c41d22f9edaaf6bd4478dd04f090dca12a9 Gerrit-Change-Number: 20282 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 25 Sep 2020 18:09:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 18:12:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 25 Sep 2020 18:12:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Call f_shutdown_helper() on all tests missing it In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 ) Change subject: bsc: Call f_shutdown_helper() on all tests missing it ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c8a1061b546576b7a5c4b11f20dfc887aaab6e0 Gerrit-Change-Number: 20257 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 18:12:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 18:25:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 25 Sep 2020 18:25:29 +0000 Subject: Change in osmo-bts[master]: vty: fix bts_dump_vty_features(): properly check BTS model flags References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20285 ) Change subject: vty: fix bts_dump_vty_features(): properly check BTS model flags ...................................................................... vty: fix bts_dump_vty_features(): properly check BTS model flags bts_internal_flag_get() expects a flag value, not an integer. Change-Id: I88de79cc45fb64144df33b0ac3e3b91537039953 --- M src/common/vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/20285/1 diff --git a/src/common/vty.c b/src/common/vty.c index d5993d6..36b0eaf 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -848,9 +848,9 @@ vty_out(vty, " BTS model specific (internal) flags:%s", VTY_NEWLINE); for (i = 0, no_features = true; i < sizeof(bts->flags) * 8; i++) { - if (bts_internal_flag_get(bts, i)) { + if (bts_internal_flag_get(bts, (1 << i))) { vty_out(vty, " %03u ", i); - vty_out(vty, "%-40s%s", get_value_string(bts_impl_flag_desc, i), VTY_NEWLINE); + vty_out(vty, "%-40s%s", get_value_string(bts_impl_flag_desc, (1 << i)), VTY_NEWLINE); no_features = false; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88de79cc45fb64144df33b0ac3e3b91537039953 Gerrit-Change-Number: 20285 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 18:25:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 25 Sep 2020 18:25:29 +0000 Subject: Change in osmo-bts[master]: bts: cosmetic: make param 'net' of gsm_bts_num() const References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20286 ) Change subject: bts: cosmetic: make param 'net' of gsm_bts_num() const ...................................................................... bts: cosmetic: make param 'net' of gsm_bts_num() const Change-Id: I378fea4aefb2cc4253cdd99ebc9c4f01b21faf95 --- M include/osmo-bts/bts.h M src/common/bts.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/20286/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index da321b0..7d3f8bf 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -319,7 +319,7 @@ #define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num); -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); +struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num); int bts_init(struct gsm_bts *bts); void bts_shutdown(struct gsm_bts *bts, const char *reason); diff --git a/src/common/bts.c b/src/common/bts.c index 983f61d..c900428 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -255,7 +255,7 @@ return bts; } -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num) +struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num) { struct gsm_bts *bts; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I378fea4aefb2cc4253cdd99ebc9c4f01b21faf95 Gerrit-Change-Number: 20286 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 18:25:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 25 Sep 2020 18:25:30 +0000 Subject: Change in osmo-bts[master]: vty: cosmetic: use osmo_talloc_replace_string() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20287 ) Change subject: vty: cosmetic: use osmo_talloc_replace_string() ...................................................................... vty: cosmetic: use osmo_talloc_replace_string() Change-Id: Ic195cef2aafec55d37152045f7714335ded0a62b --- M src/common/vty.c 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/20287/1 diff --git a/src/common/vty.c b/src/common/vty.c index 36b0eaf..dd83a11 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -637,13 +637,9 @@ { struct gsm_bts *bts = vty->index; - if (bts->pcu.sock_path) { - /* FIXME: close the interface? */ - talloc_free(bts->pcu.sock_path); - } - bts->pcu.sock_path = talloc_strdup(bts, argv[0]); - /* FIXME: re-open the interface? */ + osmo_talloc_replace_string(bts, &bts->pcu.sock_path, argv[0]); + /* FIXME: re-open the interface? */ return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic195cef2aafec55d37152045f7714335ded0a62b Gerrit-Change-Number: 20287 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 18:25:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 25 Sep 2020 18:25:30 +0000 Subject: Change in osmo-bts[master]: vty: make most struct pointers const in show/write commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20288 ) Change subject: vty: make most struct pointers const in show/write commands ...................................................................... vty: make most struct pointers const in show/write commands Change-Id: Iacc32f7982c150d84ea4df7affa1f9e07806928f --- M include/osmo-bts/bts.h M include/osmo-bts/bts_model.h M include/osmo-bts/phy_link.h M src/common/l1sap.c M src/common/phy_link.c M src/common/vty.c M src/osmo-bts-litecell15/lc15bts_vty.c M src/osmo-bts-oc2g/oc2gbts_vty.c M src/osmo-bts-octphy/octphy_vty.c M src/osmo-bts-sysmo/sysmobts_vty.c M src/osmo-bts-trx/trx_vty.c M src/osmo-bts-virtual/virtualbts_vty.c 12 files changed, 77 insertions(+), 77 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/20288/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 7d3f8bf..ffaeb57 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -347,7 +347,7 @@ int bts_supports_cm(struct gsm_bts *bts, enum gsm_phys_chan_config pchan, enum gsm48_chan_mode cm); -int32_t bts_get_avg_fn_advance(struct gsm_bts *bts); +int32_t bts_get_avg_fn_advance(const struct gsm_bts *bts); /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h index 4fd0813..568ff00 100644 --- a/include/osmo-bts/bts_model.h +++ b/include/osmo-bts/bts_model.h @@ -36,10 +36,10 @@ int bts_model_vty_init(struct gsm_bts *bts); -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts); -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx); -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink); -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst); +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts); +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx); +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink); +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst); int bts_model_oml_estab(struct gsm_bts *bts); diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index ce4ea45..ef3df27 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -164,7 +164,7 @@ const char *phy_link_state_name(enum phy_link_state state); int phy_links_open(void); -struct phy_instance *phy_instance_by_num(struct phy_link *plink, int num); +struct phy_instance *phy_instance_by_num(const struct phy_link *plink, int num); struct phy_instance *phy_instance_create(struct phy_link *plink, int num); void phy_instance_link_to_trx(struct phy_instance *pinst, struct gsm_bts_trx *trx); void phy_instance_destroy(struct phy_instance *pinst); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index eac5000..ca1949a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -882,7 +882,7 @@ } /* return the measured average of frame numbers that the RTS clock is running in advance */ -int32_t bts_get_avg_fn_advance(struct gsm_bts *bts) +int32_t bts_get_avg_fn_advance(const struct gsm_bts *bts) { if (bts->fn_stats.avg_count == 0) return 0; diff --git a/src/common/phy_link.c b/src/common/phy_link.c index d13d3f1..48ba283 100644 --- a/src/common/phy_link.c +++ b/src/common/phy_link.c @@ -79,7 +79,7 @@ return get_value_string(phy_link_state_vals, state); } -struct phy_instance *phy_instance_by_num(struct phy_link *plink, int num) +struct phy_instance *phy_instance_by_num(const struct phy_link *plink, int num) { struct phy_instance *pinst; diff --git a/src/common/vty.c b/src/common/vty.c index dd83a11..b662320 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -216,9 +216,9 @@ return CMD_SUCCESS; } -static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) +static void config_write_bts_single(struct vty *vty, const struct gsm_bts *bts) { - struct gsm_bts_trx *trx; + const struct gsm_bts_trx *trx; const char *sapi_buf; int i; @@ -281,8 +281,8 @@ bts_model_config_write_bts(vty, bts); llist_for_each_entry(trx, &bts->trx_list, list) { - struct trx_power_params *tpp = &trx->power_params; - struct phy_instance *pinst = trx_phy_instance(trx); + const struct trx_power_params *tpp = &trx->power_params; + const struct phy_instance *pinst = trx_phy_instance(trx); vty_out(vty, " trx %u%s", trx->nr, VTY_NEWLINE); if (trx->power_params.user_gain_mdB) @@ -307,7 +307,7 @@ static int config_write_bts(struct vty *vty) { struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts; + const struct gsm_bts *bts; llist_for_each_entry(bts, &net->bts_list, list) config_write_bts_single(vty, bts); @@ -315,7 +315,7 @@ return CMD_SUCCESS; } -static void config_write_phy_single(struct vty *vty, struct phy_link *plink) +static void config_write_phy_single(struct vty *vty, const struct phy_link *plink) { int i; @@ -323,7 +323,7 @@ bts_model_config_write_phy(vty, plink); for (i = 0; i < 255; i++) { - struct phy_instance *pinst = phy_instance_by_num(plink, i); + const struct phy_instance *pinst = phy_instance_by_num(plink, i); if (!pinst) break; vty_out(vty, " instance %u%s", pinst->num, VTY_NEWLINE); @@ -336,7 +336,7 @@ int i; for (i = 0; i < 255; i++) { - struct phy_link *plink = phy_link_by_num(i); + const struct phy_link *plink = phy_link_by_num(i); if (!plink) break; config_write_phy_single(vty, plink); @@ -815,7 +815,7 @@ * SHOW * ======================================================================*/ -static void net_dump_nmstate(struct vty *vty, struct gsm_nm_state *nms) +static void net_dump_nmstate(struct vty *vty, const struct gsm_nm_state *nms) { vty_out(vty,"Oper '%s', Admin '%s', Avail '%s'%s", abis_nm_opstate_name(nms->operational), @@ -823,7 +823,7 @@ abis_nm_avail_name(nms->availability), VTY_NEWLINE); } -static void bts_dump_vty_features(struct vty *vty, struct gsm_bts *bts) +static void bts_dump_vty_features(struct vty *vty, const struct gsm_bts *bts) { unsigned int i; bool no_features; @@ -855,9 +855,9 @@ vty_out(vty, " (not available)%s", VTY_NEWLINE); } -static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts) +static void bts_dump_vty(struct vty *vty, const struct gsm_bts *bts) { - struct gsm_bts_trx *trx; + const struct gsm_bts_trx *trx; vty_out(vty, "BTS %u is of %s type in band %s, has CI %u LAC %u, " "BSIC %u and %u TRX%s", @@ -904,7 +904,7 @@ bts_get_avg_fn_advance(bts), bts->fn_stats.min, bts->fn_stats.max, VTY_NEWLINE); llist_for_each_entry(trx, &bts->trx_list, list) { - struct phy_instance *pinst = trx_phy_instance(trx); + const struct phy_instance *pinst = trx_phy_instance(trx); vty_out(vty, " TRX %u%s", trx->nr, VTY_NEWLINE); if (pinst) { vty_out(vty, " phy %d %s", pinst->num, pinst->version); @@ -923,7 +923,7 @@ SHOW_STR "Display information about a BTS\n" BTS_NR_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_network *net = gsmnet_from_vty(vty); int bts_nr; if (argc != 0) { @@ -948,9 +948,9 @@ "Various testing commands\n" "Send a test OML failure event report to the BSC\n" BTS_NR_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_network *net = gsmnet_from_vty(vty); int bts_nr = atoi(argv[0]); - struct gsm_bts *bts; + const struct gsm_bts *bts; if (bts_nr >= net->num_bts) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); @@ -963,7 +963,7 @@ return CMD_SUCCESS; } -static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx) +static void trx_dump_vty(struct vty *vty, const struct gsm_bts_trx *trx) { vty_out(vty, "TRX %u of BTS %u is on ARFCN %u%s", trx->nr, trx->bts->nr, trx->arfcn, VTY_NEWLINE); @@ -994,8 +994,8 @@ SHOW_STR "Display information about a TRX\n" BTS_TRX_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts = NULL; + const struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_bts *bts = NULL; int bts_nr, trx_nr; if (argc >= 1) { @@ -1031,7 +1031,7 @@ } -static void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts) +static void ts_dump_vty(struct vty *vty, const struct gsm_bts_trx_ts *ts) { vty_out(vty, "BTS %u, TRX %u, Timeslot %u, phys cfg %s, TSC %u", ts->trx->bts->nr, ts->trx->nr, ts->nr, @@ -1050,10 +1050,10 @@ SHOW_STR "Display information about a TS\n" BTS_TRX_TS_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts = NULL; - struct gsm_bts_trx *trx = NULL; - struct gsm_bts_trx_ts *ts = NULL; + const struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_bts *bts = NULL; + const struct gsm_bts_trx *trx = NULL; + const struct gsm_bts_trx_ts *ts = NULL; int bts_nr, trx_nr, ts_nr; if (argc >= 1) { @@ -1122,7 +1122,7 @@ /* call vty_out() to print a string like " as TCH/H" for dynamic timeslots. * Don't do anything if the ts is not dynamic. */ -static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts) +static void vty_out_dyn_ts_status(struct vty *vty, const struct gsm_bts_trx_ts *ts) { switch (ts->pchan) { case GSM_PCHAN_TCH_F_TCH_H_PDCH: @@ -1152,7 +1152,7 @@ } } -static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan) +static void lchan_dump_full_vty(struct vty *vty, const struct gsm_lchan *lchan) { struct in_addr ia; @@ -1228,7 +1228,7 @@ /* TODO: MS Power Control */ } -static void lchan_dump_short_vty(struct vty *vty, struct gsm_lchan *lchan) +static void lchan_dump_short_vty(struct vty *vty, const struct gsm_lchan *lchan) { const struct gsm_meas_rep_unidir *mru = &lchan->meas.ul_res; @@ -1244,12 +1244,12 @@ VTY_NEWLINE); } -static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) +static int dump_lchan_trx_ts(const struct gsm_bts_trx_ts *ts, struct vty *vty, + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { int lchan_nr; for (lchan_nr = 0; lchan_nr < TS_MAX_LCHAN; lchan_nr++) { - struct gsm_lchan *lchan = &ts->lchan[lchan_nr]; + const struct gsm_lchan *lchan = &ts->lchan[lchan_nr]; if (lchan->state == LCHAN_S_NONE) continue; dump_cb(vty, lchan); @@ -1258,26 +1258,26 @@ return CMD_SUCCESS; } -static int dump_lchan_trx(struct gsm_bts_trx *trx, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) +static int dump_lchan_trx(const struct gsm_bts_trx *trx, struct vty *vty, + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { int ts_nr; for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { - struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; + const struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; dump_lchan_trx_ts(ts, vty, dump_cb); } return CMD_SUCCESS; } -static int dump_lchan_bts(struct gsm_bts *bts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) +static int dump_lchan_bts(const struct gsm_bts *bts, struct vty *vty, + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { int trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { - struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); + const struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); dump_lchan_trx(trx, vty, dump_cb); } @@ -1285,13 +1285,13 @@ } static int lchan_summary(struct vty *vty, int argc, const char **argv, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts; - struct gsm_bts_trx *trx; - struct gsm_bts_trx_ts *ts; - struct gsm_lchan *lchan; + const struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_bts *bts; + const struct gsm_bts_trx *trx; + const struct gsm_bts_trx_ts *ts; + const struct gsm_lchan *lchan; int bts_nr, trx_nr, ts_nr, lchan_nr; if (argc >= 1) { @@ -1370,8 +1370,8 @@ return lchan_summary(vty, argc, argv, lchan_dump_short_vty); } -static struct gsm_lchan *resolve_lchan(struct gsm_network *net, - const char **argv, int idx) +static struct gsm_lchan *resolve_lchan(const struct gsm_network *net, + const char **argv, int idx) { int bts_nr = atoi(argv[idx+0]); int trx_nr = atoi(argv[idx+1]); diff --git a/src/osmo-bts-litecell15/lc15bts_vty.c b/src/osmo-bts-litecell15/lc15bts_vty.c index 2cc812c..5308d1a 100644 --- a/src/osmo-bts-litecell15/lc15bts_vty.c +++ b/src/osmo-bts-litecell15/lc15bts_vty.c @@ -505,9 +505,9 @@ return CMD_SUCCESS; } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { - struct bts_lc15_priv *bts_lc15 = bts->model_priv; + const struct bts_lc15_priv *bts_lc15 = bts->model_priv; vty_out(vty, " led-control-mode %s%s", get_value_string(lc15_led_mode_strs, bts_lc15->led_ctrl_mode), VTY_NEWLINE); @@ -516,16 +516,16 @@ } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { vty_out(vty, " nominal-tx-power %d%s", trx->nominal_power,VTY_NEWLINE); } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { int i; diff --git a/src/osmo-bts-oc2g/oc2gbts_vty.c b/src/osmo-bts-oc2g/oc2gbts_vty.c index 8dc4efa..c12d0bf 100644 --- a/src/osmo-bts-oc2g/oc2gbts_vty.c +++ b/src/osmo-bts-oc2g/oc2gbts_vty.c @@ -541,7 +541,7 @@ } */ -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { /* TODO(oramadan) MERGE struct gsm_bts_role_bts *btsb = bts_role_bts(bts); @@ -555,16 +555,16 @@ } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { vty_out(vty, " nominal-tx-power %d%s", trx->nominal_power,VTY_NEWLINE); } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { int i; diff --git a/src/osmo-bts-octphy/octphy_vty.c b/src/osmo-bts-octphy/octphy_vty.c index afc2ce7..8b263fd 100644 --- a/src/osmo-bts-octphy/octphy_vty.c +++ b/src/osmo-bts-octphy/octphy_vty.c @@ -360,7 +360,7 @@ return CMD_SUCCESS; } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { if (plink->u.octphy.netdev_name) vty_out(vty, " octphy net-device %s%s", @@ -399,15 +399,15 @@ #endif } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { } diff --git a/src/osmo-bts-sysmo/sysmobts_vty.c b/src/osmo-bts-sysmo/sysmobts_vty.c index 7876612..b613031 100644 --- a/src/osmo-bts-sysmo/sysmobts_vty.c +++ b/src/osmo-bts-sysmo/sysmobts_vty.c @@ -433,22 +433,22 @@ } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { if (trx->nominal_power != get_p_max_out_mdBm(trx)) vty_out(vty, " nominal-tx-power %d%s", trx->nominal_power, VTY_NEWLINE); } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { int i; diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 6b8ca77..e5199ec 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -514,7 +514,7 @@ return CMD_SUCCESS; } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { if (plink->u.osmotrx.local_ip) vty_out(vty, " osmotrx ip local %s%s", @@ -542,7 +542,7 @@ vty_out(vty, " osmotrx trxd-max-version %d%s", plink->u.osmotrx.trxd_hdr_ver_max, VTY_NEWLINE); } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -571,11 +571,11 @@ VTY_NEWLINE); } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; diff --git a/src/osmo-bts-virtual/virtualbts_vty.c b/src/osmo-bts-virtual/virtualbts_vty.c index 875e682..9d63242 100644 --- a/src/osmo-bts-virtual/virtualbts_vty.c +++ b/src/osmo-bts-virtual/virtualbts_vty.c @@ -52,19 +52,19 @@ static struct gsm_bts *vty_bts; -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { if (plink->u.virt.mcast_dev) vty_out(vty, " virtual-um net-device %s%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iacc32f7982c150d84ea4df7affa1f9e07806928f Gerrit-Change-Number: 20288 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 18:54:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 18:54:13 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 to look at the new patch set (#2). Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Introduce NM operative state Radio Carrier FSM All the Operative State logic to manage a RadioCarrier NM object is centralized in this FSM, where other parts of the code simply send events to it. This allows keeping state consistent and offloading logic from each bts backend, since they are only required to submit events now. The idea in the long run is to also replace other NM objects with similar FSMs. This improved logic fixes bug where PHY + RSL link became available before OPSTART and hence op state changed to Enabled before receiving any OPSTART message. Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts_trx.h A include/osmo-bts/nm_radio_carrier_fsm.h M src/common/Makefile.am M src/common/bts_trx.c A src/common/nm_radio_carrier_fsm.c M src/common/phy_link.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 18 files changed, 358 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20284/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 19:20:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 19:20:59 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 to look at the new patch set (#3). Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Introduce NM operative state Radio Carrier FSM All the Operative State logic to manage a RadioCarrier NM object is centralized in this FSM, where other parts of the code simply send events to it. This allows keeping state consistent and offloading logic from each bts backend, since they are only required to submit events now. The idea in the long run is to also replace other NM objects with similar FSMs. This improved logic fixes bug where PHY + RSL link became available before OPSTART and hence op state changed to Enabled before receiving any OPSTART message. Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts_trx.h A include/osmo-bts/nm_radio_carrier_fsm.h M src/common/Makefile.am M src/common/bts_trx.c A src/common/nm_radio_carrier_fsm.c M src/common/phy_link.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 18 files changed, 359 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20284/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 20:37:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 20:37:33 +0000 Subject: Change in osmo-bts[master]: sched_lchan_tchh: initialize meas_avg with zeros In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20282 ) Change subject: sched_lchan_tchh: initialize meas_avg with zeros ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/20282/1/src/osmo-bts-trx/sched_lchan_tchh.c File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/20282/1/src/osmo-bts-trx/sched_lchan_tchh.c at 219 PS1, Line 219: trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode); Why not making sure the array is ALWAYS properly populated in this function? So you don't need to always first zero initialize it and then refill it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c3c1c41d22f9edaaf6bd4478dd04f090dca12a9 Gerrit-Change-Number: 20282 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 20:37:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 20:37:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 20:37:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Call f_shutdown_helper() on all tests missing it In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 ) Change subject: bsc: Call f_shutdown_helper() on all tests missing it ...................................................................... bsc: Call f_shutdown_helper() on all tests missing it This should hopefully avoid sporadic errors during tear down of tests such as TC_si_acc_rotate. Change-Id: I8c8a1061b546576b7a5c4b11f20dfc887aaab6e0 --- M bsc/BSC_Tests.ttcn 1 file changed, 145 insertions(+), 53 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9e0fae3..7f670d2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1148,7 +1148,7 @@ IPA_RSL[0].send(ts_ASP_RSL_UD(ts_RSL_CHAN_RQD('23'O, 23))); rsl_unused := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); - setverdict(pass); + f_shutdown_helper(); } /* verify if the "chreq:total" counter increments as expected */ @@ -1164,7 +1164,7 @@ rsl_unused := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total", chreq_total+1); - setverdict(pass); + f_shutdown_helper(); } /* CHAN RQD -> CHAN ACT -> CHAN ACT ACK -> RF CHAN REL */ @@ -1177,7 +1177,7 @@ /* expect BSC to disable the channel again if there's no RLL EST IND */ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL), T3101_MAX); - setverdict(pass); + f_shutdown_helper(); } /* Normal variant */ @@ -1236,7 +1236,7 @@ /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if MSC answers with CREF to CR */ @@ -1257,7 +1257,7 @@ /* expect BSC to disable the channel */ f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* CHAN RQD -> CHAN ACT -> CHAN ACT NACK -> RF CHAN REL */ @@ -1280,7 +1280,7 @@ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chan_act:nack", chact_nack+1); - setverdict(pass); + f_shutdown_helper(); } /* Test for channel exhaustion due to RACH overload */ @@ -1329,6 +1329,7 @@ } [] IPA_RSL[0].receive { repeat; } } + f_shutdown_helper(); } /* Test channel deactivation due to silence from MS */ @@ -1360,6 +1361,7 @@ setverdict(fail, "Unexpected RSL message!"); } } + f_shutdown_helper(); } /*********************************************************************** @@ -1374,7 +1376,7 @@ BSSAP.send(ts_BSSAP_CONNECT_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own, 2342, ts_BSSMAP_AssignmentReq)); BSSAP.receive(tr_BSSAP_DISC_ind(2342, ?, ?)); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if MSC answers with CREF to CR */ @@ -1405,6 +1407,7 @@ } [] BSSAP.receive { repeat; } } + f_shutdown_helper(); } /* generate an assignment request for either AoIP or SCCPlite */ @@ -1492,6 +1495,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); + f_shutdown_helper(); } testcase TC_assignment_ctm() runs on test_CT { @@ -1500,6 +1504,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCTM); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for Speech+CTM"); + f_shutdown_helper(); } type record DchanTuple { @@ -1577,7 +1582,7 @@ /* wait for SCCP emulation to do its job */ f_sleep(1.0); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after CONN FAIL IND from BTS */ @@ -1606,7 +1611,7 @@ /* wait for SCCP emulation to do its job */ f_sleep(1.0); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of early CONN FAIL IND from BTS (before EST IND!) */ @@ -1629,7 +1634,7 @@ /* BTS<-BSC: respond with CHAN REL ACK */ f_ipa_tx(0, ts_RSL_RF_CHAN_REL_ACK(dt.rsl_chan_nr)); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of late CONN FAIL IND from BTS (ater REL IND!) */ @@ -1662,7 +1667,7 @@ /* BSC<-MSC: MSC disconnects as requested. */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - setverdict(pass); + f_shutdown_helper(); } function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, @@ -1797,7 +1802,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after Clear Command with CSFB indicator from MSC */ @@ -1820,7 +1825,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false, is_csfb := true); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after hard RLSD from MSC */ @@ -1835,7 +1840,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after hard RLSD from MSC and MS is not responding to RLL REL REQ */ @@ -1850,7 +1855,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Test behavior of channel release after BSSMAP RESET from MSC */ @@ -1872,7 +1877,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Verify T(iar) triggers and releases the channel */ @@ -1889,7 +1894,7 @@ dt := f_est_dchan('23'O, 23, '00010203040506'O); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } private function f_tc_chan_rel_rr_cause(myBSSMAP_Cause clear_cmd_cause, template RR_Cause expect_rr_cause) @@ -1905,7 +1910,7 @@ } f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false, expect_rr_cause := expect_rr_cause); - setverdict(pass); + f_shutdown_helper(); } /* Test that Clear Command cause codes affect the RR Channel Release cause code */ @@ -1940,7 +1945,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if RSL EST IND for invalid SAPI */ @@ -1965,7 +1970,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if RSL EST IND for invalid SAPI */ @@ -1989,7 +1994,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } /* Test behavior if RSL EST IND for invalid SACCH */ @@ -2013,7 +2018,7 @@ [] T.timeout {} } - setverdict(pass); + f_shutdown_helper(); } private function f_exp_sapi_n_reject(template (present) GsmSapi sapi := ?, @@ -2070,7 +2075,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Check if we get SAPI N Reject on receipt of unexpected RLL ERROR INDication */ @@ -2098,7 +2103,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } /* Check if we get SAPI N Reject due to a SAPI=3 link establishment timeout */ @@ -2124,12 +2129,13 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); - setverdict(pass); + f_shutdown_helper(); } testcase TC_si_default() runs on test_CT { f_init(0); f_init_bts_and_check_sysinfo(0, expect_si := SystemInformationConfig_default); + f_shutdown_helper(); } /* We're testing SI2quater with lists of EARFCNs. Instead of just incrementing EARFCNs, also pick some from the edges of @@ -2239,46 +2245,57 @@ testcase TC_si2quater_2_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(2); + f_shutdown_helper(); } testcase TC_si2quater_3_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(3); + f_shutdown_helper(); } testcase TC_si2quater_4_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(4); + f_shutdown_helper(); } testcase TC_si2quater_5_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(5); + f_shutdown_helper(); } testcase TC_si2quater_6_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(6); + f_shutdown_helper(); } testcase TC_si2quater_12_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(12); + f_shutdown_helper(); } testcase TC_si2quater_23_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(23); + f_shutdown_helper(); } testcase TC_si2quater_32_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(32); + f_shutdown_helper(); } testcase TC_si2quater_33_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(33); + f_shutdown_helper(); } testcase TC_si2quater_42_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(42); + f_shutdown_helper(); } testcase TC_si2quater_48_earfcns() runs on test_CT { f_tc_si2quater_n_earfcns(48); + f_shutdown_helper(); } /* verify the VTY error response when adding too many EARFCNs, and showing that osmo-bsc still sends 16 SI2quater with @@ -2312,6 +2329,7 @@ for (var integer i := 1; i < 48; i := i + 1) { f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i))}); } + f_shutdown_helper(); } private function f_acc09_count_allowed(AccessControlClass acc) return uint8_t @@ -2398,6 +2416,7 @@ f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10", "rach access-control-class 5 allowed"}); + f_shutdown_helper(); } /* verify ACC startup ramp+rotate feature */ @@ -2458,6 +2477,7 @@ f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10", "rach access-control-class 4 allowed", "no access-control-class-ramping"}); + f_shutdown_helper(); } testcase TC_ctrl_msc_connection_status() runs on test_CT { @@ -2467,7 +2487,7 @@ /* See https://osmocom.org/issues/2729 */ f_ctrl_get_exp(IPA_CTRL, "msc_connection_status", "connected"); - setverdict(pass); + f_shutdown_helper(); } testcase TC_ctrl_msc0_connection_status() runs on test_CT { @@ -2476,7 +2496,7 @@ f_init(1); f_ctrl_get_exp(IPA_CTRL, "msc.0.connection_status", "connected"); - setverdict(pass); + f_shutdown_helper(); } testcase TC_ctrl() runs on test_CT { @@ -2508,7 +2528,7 @@ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:attempted", 0); - setverdict(pass); + f_shutdown_helper(); } /* Verify that Upon receival of SET "location", BSC forwards a TRAP @@ -2534,7 +2554,7 @@ /* should match the one from config */ f_ctrl_set(SCCPLITE_IPA_CTRL, "rf_locked", "0"); - setverdict(pass); + f_shutdown_helper(); } @@ -2935,7 +2955,7 @@ } } - setverdict(pass); + f_shutdown_helper(); } /* Test RSL link drop causes counter increment */ @@ -2950,7 +2970,7 @@ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "rsl_fail", rsl_fail+1); - setverdict(pass); + f_shutdown_helper(); } /* TODO: Test OML link drop causes counter increment */ @@ -2996,6 +3016,7 @@ } else { setverdict(fail, "Timeout RSL waiting for connection to close"); } + f_shutdown_helper(); } @@ -3006,6 +3027,7 @@ } else { setverdict(fail, "Timeout OML waiting for connection to close"); } + f_shutdown_helper(); } @@ -3083,6 +3105,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_ciph_mode_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3093,6 +3116,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_ciph_mode_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3103,6 +3127,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); vc_conn.done; + f_shutdown_helper(); } /* establish initial channel, enable ciphering followed by assignment to ciphered channel */ @@ -3122,6 +3147,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_aoip_tla_v6), pars); vc_conn.done; + f_shutdown_helper(); } @@ -3144,6 +3170,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_fr_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3154,6 +3181,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_fr_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3164,6 +3192,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } /* Expect ASSIGNMENT FAIL if mandatory IE is missing */ @@ -3186,6 +3215,7 @@ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing)); vc_conn.done; + f_shutdown_helper(); } private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { @@ -3209,6 +3239,7 @@ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_4)); vc_conn.done; + f_shutdown_helper(); } @@ -3238,6 +3269,7 @@ vc_conn := f_start_handler(refers(f_tc_assignment_sign)); vc_conn.done; + f_shutdown_helper(); } /*********************************************************************** @@ -3448,6 +3480,7 @@ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_codec_hr() runs on test_CT { @@ -3460,6 +3493,7 @@ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_codec_efr() runs on test_CT { @@ -3472,6 +3506,7 @@ pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecEFR})); vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } /* Allow 5,90k only (current default config) */ @@ -3529,6 +3564,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h() runs on test_CT { @@ -3553,6 +3589,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } function f_TC_assignment_codec_amr(boolean fr, octetstring mrconf, bitstring s8_s0, bitstring exp_s8_s0) @@ -3616,56 +3653,67 @@ * set. */ testcase TC_assignment_codec_amr_f_S1() runs on test_CT { f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); + f_shutdown_helper(); } /* Set S1, we expect an AMR multirate configuration IE with the lower three * rates set. */ testcase TC_assignment_codec_amr_h_S1() runs on test_CT { f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); + f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_f_S124() runs on test_CT { f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); + f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_h_S124() runs on test_CT { f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); + f_shutdown_helper(); } /* The following block of tests selects more and more rates until all four * possible rates are in the active set (full rate) */ testcase TC_assignment_codec_amr_f_S0() runs on test_CT { f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S02() runs on test_CT { f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S024() runs on test_CT { f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S0247() runs on test_CT { f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); + f_shutdown_helper(); } /* The following block of tests selects more and more rates until all three * possible rates are in the active set (half rate) */ testcase TC_assignment_codec_amr_h_S0() runs on test_CT { f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S02() runs on test_CT { f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S024() runs on test_CT { f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); + f_shutdown_helper(); } /* The following block tests what happens when the MSC does offer rate @@ -3678,6 +3726,7 @@ /* Try to include 12,2k in into the active set even though the channel * is half rate only. The BSC is expected to remove the 12,0k */ f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S01234567() runs on test_CT { @@ -3685,6 +3734,7 @@ * Also S1 is selected, this setting will be prefered and we should * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S0234567() runs on test_CT { @@ -3692,21 +3742,25 @@ * select the currently supported rates, which are also 12.2k, 7,40k, * 5,90k, and 4,75k, into the active set. */ f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_zero() runs on test_CT { /* Try to select no rates at all */ f_TC_assignment_codec_amr_fail(true, '00000000'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_unsupp() runs on test_CT { /* Try to select only unsupported rates */ f_TC_assignment_codec_amr_fail(true, '01101000'B); + f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S7() runs on test_CT { /* Try to select 12,2k for half rate */ f_TC_assignment_codec_amr_fail(false, '10000000'B); + f_shutdown_helper(); } private function f_disable_all_tch_f() runs on test_CT { @@ -3841,7 +3895,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR channel while all FR channels are exhausted, this is expected @@ -3855,7 +3909,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr_fail)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR (prefered) or alternatively a HR channel while all FR channels @@ -3869,7 +3923,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_fr_hr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a HR (prefered) or alternatively a FR channel while all FR channels @@ -3883,7 +3937,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_fr_exhausted_req_hr_fr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR channel while all HR channels are exhausted, this is expected @@ -3897,7 +3951,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_fr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a HR channel while all HR channels are exhausted, this is expected @@ -3911,7 +3965,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_xr_exhausted_req_hr_fail)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a HR (prefered) or alternatively a FR channel while all HR channels @@ -3925,7 +3979,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_hr_fr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Request a FR (prefered) or alternatively a HR channel while all HR channels @@ -3939,7 +3993,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec_hr_exhausted_req_fr_hr)); vc_conn.done; f_enable_all_tch(); - setverdict(pass); + f_shutdown_helper(); } /* Allow FR and HR, but prefer HR */ @@ -3977,7 +4031,7 @@ f_enable_all_tch(); vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_hr_fr)); vc_conn.done; - setverdict(pass); + f_shutdown_helper(); } /* Request a FR (prefered) or alternatively a HR channel, it is expected that @@ -3989,7 +4043,7 @@ f_enable_all_tch(); vc_conn := f_start_handler(refers(f_TC_assignment_codec_req_fr_hr)); vc_conn.done; - setverdict(pass); + f_shutdown_helper(); } testcase TC_assignment_osmux() runs on test_CT { @@ -4015,6 +4069,7 @@ vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; + f_shutdown_helper(); } /* test the procedure of the MSC requesting a Classmark Update: @@ -4040,6 +4095,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_classmark)); vc_conn.done; + f_shutdown_helper(); } /* Send a CommonID from the simulated MSC and verify that the information is used to @@ -4067,6 +4123,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_common_id)); vc_conn.done; + f_shutdown_helper(); } private function f_est_single_l3(template PDU_ML3_MS_NW l3) runs on MSC_ConnHdlr { @@ -4105,6 +4162,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_unsol_ass_fail)); vc_conn.done; + f_shutdown_helper(); } @@ -4119,6 +4177,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_unsol_ass_compl)); vc_conn.done; + f_shutdown_helper(); } @@ -4133,6 +4192,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_unsol_ho_fail)); vc_conn.done; + f_shutdown_helper(); } @@ -4153,6 +4213,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_err_82_short_msg)); vc_conn.done; + f_shutdown_helper(); } @@ -4174,6 +4235,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_err_84_unknown_msg)); vc_conn.done; + f_shutdown_helper(); } /*********************************************************************** @@ -4286,6 +4348,7 @@ f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted"); f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:completed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ @@ -4395,6 +4458,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:completed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* BSC asks for inter-BSC HO, but the MSC decides that it won't happen and @@ -4452,6 +4516,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports @@ -4546,6 +4611,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:failed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* BSC asks for inter-BSC-out HO, receives BSSMAP Handover Command, but then no reply is received about HO outcome @@ -4643,6 +4709,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_into_this_bsc(charstring id) runs on MSC_ConnHdlr { @@ -4732,12 +4799,14 @@ testcase TC_ho_into_this_bsc() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); f_tc_ho_into_this_bsc_main(pars); + f_shutdown_helper(); } testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.host_aoip_tla := "::6"; f_tc_ho_into_this_bsc_main(pars); + f_shutdown_helper(); } private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr { @@ -4819,6 +4888,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:stopped"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_in_fail_msc_clears_after_ho_detect(charstring id) runs on MSC_ConnHdlr { @@ -4884,7 +4954,6 @@ BSSAP.send(ts_BSSMAP_ClearCommand(cause)); f_expect_dlcx_conns(); - setverdict(pass); f_sleep(1.0); } testcase TC_ho_in_fail_msc_clears_after_ho_detect() runs on test_CT { @@ -4907,6 +4976,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:stopped"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* The new BSS's lchan times out before the MSC decides that handover failed. */ @@ -4971,10 +5041,7 @@ BSSAP.send(ts_BSSMAP_ClearCommand(cause)); f_expect_dlcx_conns(); - setverdict(pass); f_sleep(1.0); - - setverdict(pass); } testcase TC_ho_in_fail_no_detect() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -4996,6 +5063,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* Same as f_tc_ho_in_fail_no_detect, but MSC fails to send a Clear Command */ @@ -5052,7 +5120,6 @@ BSSAP.send(ts_BSSMAP_ClearCommand(cause)); }; f_expect_dlcx_conns(); - setverdict(pass); f_sleep(1.0); } testcase TC_ho_in_fail_no_detect2() runs on test_CT { @@ -5075,6 +5142,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } type record of charstring Commands; @@ -5291,6 +5359,7 @@ f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_2(charstring id) runs on MSC_ConnHdlr { @@ -5340,6 +5409,7 @@ f_ctrs_bsc_and_bts_add(0, "handover:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_3(charstring id) runs on MSC_ConnHdlr { @@ -5388,6 +5458,7 @@ f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_4(charstring id) runs on MSC_ConnHdlr { @@ -5443,6 +5514,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_5(charstring id) runs on MSC_ConnHdlr { @@ -5484,6 +5556,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_6(charstring id) runs on MSC_ConnHdlr { @@ -5524,6 +5597,7 @@ f_ctrs_bsc_and_bts_add(0, "handover:error"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } private function f_tc_ho_neighbor_config_7(charstring id) runs on MSC_ConnHdlr { @@ -5577,6 +5651,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(); } /* OS#3041: Open and close N connections in a normal fashion, and expect no @@ -5830,7 +5905,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } /* Test IPA PDCH activation NACK */ @@ -5867,7 +5942,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } @@ -5936,7 +6011,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } /* Test Osmocom dyn PDCH activation NACK behavior */ @@ -5965,7 +6040,7 @@ /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); - setverdict(pass); + f_shutdown_helper(); } testcase TC_chopped_ipa_ping() runs on test_CT { @@ -5973,6 +6048,7 @@ 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); } + f_shutdown_helper(); } testcase TC_chopped_ipa_payload() runs on test_CT { @@ -5981,6 +6057,7 @@ 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); } + f_shutdown_helper(); } /* Verify the BSC sends the MS Power Parameters IE during CHAN ACT to make sure @@ -5995,6 +6072,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; + f_shutdown_helper(); } /*********************************************************************** @@ -6144,6 +6222,7 @@ vc_conn.done; f_ctrs_msc_expect(0, "mscpool:subscr:new", 4); + f_shutdown_helper(); } /* Three Layer 3 Complete by IMSI are round-robin'ed across two connected MSCs */ @@ -6184,6 +6263,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:new"); + f_shutdown_helper(); } /* Three LU by TMSI are round-robin'ed across two connected MSCs, because they contain the NULL-NRI 0 @@ -6225,6 +6305,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:reattach"); + f_shutdown_helper(); } /* Three LU by TMSI are round-robin'ed across two connected MSCs, because they contain the NULL-NRI 1 @@ -6267,6 +6348,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:reattach"); + f_shutdown_helper(); } /* Three Layer 3 Complete by TMSI are round-robin'ed across two connected MSCs, because they contain an NRI not @@ -6311,6 +6393,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:new"); + f_shutdown_helper(); } /* Three Layer 3 Complete by TMSI are round-robin'ed across two connected MSCs, because they contain an NRI @@ -6361,6 +6444,7 @@ f_ctrs_msc_add(2, "mscpool:subscr:attach_lost"); f_ctrs_msc_add(0, "mscpool:subscr:new"); f_ctrs_msc_verify(); + f_shutdown_helper(); } /* Three Layer 3 Complete by TMSI with valid NRI for the second MSC are all directed to the second MSC (configured in @@ -6404,6 +6488,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(1, "mscpool:subscr:known"); + f_shutdown_helper(); } /* Layer 3 Complete by TMSI with valid NRI for the third MSC are directed to the third MSC (configured in osmo-bsc.cfg), @@ -6447,6 +6532,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(1, "mscpool:subscr:new"); + f_shutdown_helper(); } /* LU with a TMSI but indicating a different PLMN in its previous LAI: ignore the NRI. */ @@ -6480,6 +6566,7 @@ vc_conn2 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars2); vc_conn2.done; f_ctrs_msc_expect(2, "mscpool:subscr:known"); + f_shutdown_helper(); } /* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by IMSI, which would be @@ -6509,7 +6596,6 @@ /* Despite the round robin pointing at the second MSC ('roundrobin next 1'), the earlier Paging for the same IMSI * causes this Paging Response to go to the first MSC (bssap_idx := 0). */ f_perform_compl_l3(RSL, ts_PAG_RESP(valueof(ts_MI_IMSI_LV(imsi))) ); - setverdict(pass); f_sleep(1.0); } testcase TC_mscpool_paging_and_response_imsi() runs on test_CT { @@ -6530,6 +6616,7 @@ vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_imsi), pars1); vc_conn1.done; f_ctrs_msc_expect(0, "mscpool:subscr:paged"); + f_shutdown_helper(); } /* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by TMSI with an NRI value @@ -6561,7 +6648,6 @@ * third MSC ('roundrobin next 2'), the earlier Paging for the same TMSI causes this Paging Response to go to * the first MSC (bssap_idx := 0). */ f_perform_compl_l3(RSL, ts_PAG_RESP(valueof(ts_MI_TMSI_NRI_LV(nri_v))) ); - setverdict(pass); f_sleep(1.0); } testcase TC_mscpool_paging_and_response_tmsi() runs on test_CT { @@ -6582,6 +6668,7 @@ vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_tmsi), pars1); vc_conn1.done; f_ctrs_msc_expect(0, "mscpool:subscr:paged"); + f_shutdown_helper(); } /* For round-robin, skip an MSC that has 'no allow-attach' set. */ @@ -6623,6 +6710,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(0, "mscpool:subscr:new"); + f_shutdown_helper(); } /* An MSC that has 'no allow-attach' set should still serve subscribers that are already attached according to their @@ -6666,6 +6754,7 @@ vc_conn3 := f_start_handler(refers(f_tc_mscpool_compl_l3), pars3); vc_conn3.done; f_ctrs_msc_expect(2, "mscpool:subscr:new"); + f_shutdown_helper(); } /* Allow/Deny emergency calls globally via VTY */ @@ -6769,6 +6858,7 @@ f_vty_allow_emerg_bts(true, 0); vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_allow), pars); vc_conn.done; + f_shutdown_helper(); } /* EMERGENCY CALL situation #2, forbidden globally but allowed by BTS */ @@ -6783,6 +6873,7 @@ f_vty_allow_emerg_bts(true, 0); vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny), pars); vc_conn.done; + f_shutdown_helper(); } /* EMERGENCY CALL situation #3, allowed globally but forbidden by BTS */ @@ -6802,6 +6893,7 @@ f_vty_allow_emerg_bts(false, 0); vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny), pars); vc_conn.done; + f_shutdown_helper(); } /* Test what happens when an emergency call arrives while all TCH channels are @@ -6843,7 +6935,7 @@ f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 33)); rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); - setverdict(pass); + f_shutdown_helper(); } /* Hopping parameters per a timeslot */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c8a1061b546576b7a5c4b11f20dfc887aaab6e0 Gerrit-Change-Number: 20257 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 20:39:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 20:39:04 +0000 Subject: Change in osmo-bts[master]: vty: fix bts_dump_vty_features(): properly check BTS model flags In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20285 ) Change subject: vty: fix bts_dump_vty_features(): properly check BTS model flags ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88de79cc45fb64144df33b0ac3e3b91537039953 Gerrit-Change-Number: 20285 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 20:39:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 20:40:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 20:40:17 +0000 Subject: Change in osmo-bts[master]: bts: cosmetic: make param 'net' of gsm_bts_num() const In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20286 ) Change subject: bts: cosmetic: make param 'net' of gsm_bts_num() const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I378fea4aefb2cc4253cdd99ebc9c4f01b21faf95 Gerrit-Change-Number: 20286 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 20:40:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 20:41:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 25 Sep 2020 20:41:26 +0000 Subject: Change in osmo-bts[master]: vty: cosmetic: use osmo_talloc_replace_string() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20287 ) Change subject: vty: cosmetic: use osmo_talloc_replace_string() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/20287/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/20287/1//COMMIT_MSG at 7 PS1, Line 7: vty: cosmetic: use osmo_talloc_replace_string() This is not comsetic... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic195cef2aafec55d37152045f7714335ded0a62b Gerrit-Change-Number: 20287 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 25 Sep 2020 20:41:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Sep 25 22:17:25 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 25 Sep 2020 22:17:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HACK: don't make NS_Emulation depend on PCUIF_Types In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20116 ) Change subject: HACK: don't make NS_Emulation depend on PCUIF_Types ...................................................................... Patch Set 5: Abandon? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2b1530c36f69fc932f0e86d821e620e562b3a111 Gerrit-Change-Number: 20116 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Fri, 25 Sep 2020 22:17:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Sep 26 01:38:55 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 26 Sep 2020 01:38:55 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f6e9bc09f61e_25bb2af2c93dc5fc874796@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 158s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 158s] [COMPILING libboard/qmod/source/card_pres.c] [ 158s] [COMPILING libboard/qmod/source/wwan_led.c] [ 158s] [COMPILING libboard/qmod/source/i2c.c] [ 159s] [COMPILING libboard/qmod/source/board_qmod.c] [ 159s] [COMPILING apps/dfu/main.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 159s] Memory region Used Size Region Size %age Used [ 159s] rom: 16588 B 16 KB 101.25% [ 159s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 159s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 159s] collect2: error: ld returned 1 exit status [ 159s] % [ 159s] make[2]: *** [Makefile:234: flash] Error 1 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 159s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 159s] dh_auto_build: error: make -j1 returned exit code 2 [ 159s] make: *** [debian/rules:16: build] Error 25 [ 159s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 159s] ### VM INTERACTION START ### [ 162s] [ 151.457874] sysrq: Power Off [ 162s] [ 151.466200] reboot: Power down [ 163s] ### VM INTERACTION END ### [ 163s] [ 163s] lamb27 failed "build simtrace2_0.7.0.63.39070.dsc" at Sat Sep 26 01:38:43 UTC 2020. [ 163s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Sep 26 10:52:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 26 Sep 2020 10:52:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HACK: don't make NS_Emulation depend on PCUIF_Types In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20116 ) Change subject: HACK: don't make NS_Emulation depend on PCUIF_Types ...................................................................... Abandoned superseded by oter patch -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2b1530c36f69fc932f0e86d821e620e562b3a111 Gerrit-Change-Number: 20116 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: lynxis lazus Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 17:04:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 17:04:09 +0000 Subject: Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG ...................................................................... gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG The NM_ATT_OSMO_NS_LINK_CFG is used for NSVC configuration of osmocom based BTS to support IPv6 NSVCs. Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f --- M include/osmocom/gsm/protocol/gsm_12_21.h 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/20289/1 diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h index 06755c9..34622b3 100644 --- a/include/osmocom/gsm/protocol/gsm_12_21.h +++ b/include/osmocom/gsm/protocol/gsm_12_21.h @@ -789,6 +789,13 @@ IPAC_BINF_CELL_ALLOC = (1 << 2), }; +/*! Osmocom NSVC address type for NM_ATT_OSMO_NS_LINK_CFG */ +enum osmo_oml_nsvc_address_type { + OSMO_NSVC_ADDR_UNSPEC = 0x00, + OSMO_NSVC_ADDR_IPV4 = 0x04, + OSMO_NSVC_ADDR_IPV6 = 0x29, +}; + /*! 3GPP TS 52.021 ?9.4.62 SW Description */ struct abis_nm_sw_desc { uint8_t file_id[UINT8_MAX]; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 17:09:22 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 17:09:22 +0000 Subject: Change in osmo-pcu[master]: Use the new NS2 lib In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20271 ) Change subject: Use the new NS2 lib ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20271/1/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20271/1/src/gprs_bssgp_pcu.cpp at 630 PS1, Line 630: struct gprs_ns2_inst *nsi = (struct gprs_ns2_inst *) ctx; : struct osmo_gprs_ns2_prim nsp = {}; : nsp.nsei = msgb_nsei(msg); : nsp.bvci = msgb_bvci(msg); : osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA, : PRIM_OP_REQUEST, msg); : return gprs_ns2_recv_prim(nsi, &nsp.oph); > Any reason to go for a primitive on the stack instaed? I used the same way as it was used in bssgp (osmo_bssgp_prim) and in the lapm (osmo_dlsap_prim). -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib389925cf5c9f18951af6242c31ea70476218e9a Gerrit-Change-Number: 20271 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 26 Sep 2020 17:09:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 17:12:44 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 17:12:44 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: Hello fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 to look at the new patch set (#2). Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Convert paging response timer into an osmocom own X4 timer All timeout values should use tdef. Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 --- M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/paging.c M src/libmsc/ran_infra.c M tests/test_nodes.vty 6 files changed, 21 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/20280/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-CC: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 17:13:42 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 17:13:42 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 3: (2 comments) I've dropped the PCU socket part. it shouldn't be in here and will be in a second patch https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bsc_vty.c at 3043 PS3, Line 3043: ret = osmo_sockaddr_str_from_str2(&remote, argv[1]); > You could probably simply use osmo_ip_str_type() and feet address_family to the switch statement bel [?] Yes it would be possible. I would leave it as it is because it's just a different api which saves a little bit stack here. https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/3/src/osmo-bsc/bts_ipaccess_nanobts.c at 232 PS3, Line 232: LOGP(DLINP, LOGL_ERROR, "BTS %d does not support IPv6 but require it!\n", bts->nr); > this err string is confusing. Better "but an IPv6 address was configured". Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 17:13:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 17:33:40 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 17:33:40 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 to look at the new patch set (#4). Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 7 files changed, 82 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 17:35:34 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 17:35:34 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 4: (1 comment) Depends on I9e279bb20940c66eea5196f281184cb4f8a5cc5f https://gerrit.osmocom.org/c/osmo-bsc/+/20234/4/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/4/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 216 PS4, Line 216: buf[4] = *(((char *) &bts->gprs.nsvc[0].remote.u.sin6.sin6_port) + 0); @pespin: do you like it more than a memcpy? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 17:35:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 17:36:03 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 17:36:03 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 to look at the new patch set (#5). Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Depends: I9e279bb20940c66eea5196f281184cb4f8a5cc5f (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 7 files changed, 82 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 18:51:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 26 Sep 2020 18:51:38 +0000 Subject: Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 18:51:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 18:53:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 26 Sep 2020 18:53:50 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/20280/3/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/20280/3/src/libmsc/msc_vty.c at 581 PS3, Line 581: for (rat=0; rat Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 18:53:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 18:59:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 26 Sep 2020 18:59:14 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20234/5/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/5/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 216 PS5, Line 216: buf[4] = *(((char *) &bts->gprs.nsvc[0].remote.u.sin6.sin6_port) + 0); Ok I didn't think about the target where you store is a char buf. cannot you simply do this? *((uint16_t*)&buf[4]) = bts->gprs.nsvc[0].remote.u.sin6.sin6_port; If you cannot then mempcy is fine, but I think you should be able to. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 18:59:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 19:02:12 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 19:02:12 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20234/5/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/5/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 216 PS5, Line 216: buf[4] = *(((char *) &bts->gprs.nsvc[0].remote.u.sin6.sin6_port) + 0); > Ok I didn't think about the target where you store is a char buf. [?] That could be an unaligned access. I could change the pointer type to (uint8_t). but wouldn't be a big difference. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 19:02:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 19:04:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 26 Sep 2020 19:04:18 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20234/5/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20234/5/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c at 216 PS5, Line 216: buf[4] = *(((char *) &bts->gprs.nsvc[0].remote.u.sin6.sin6_port) + 0); > That could be an unaligned access. [?] Indeed, good point, my bad then, feel free to move back to memcpy. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 19:04:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 19:10:17 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 19:10:17 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 to look at the new patch set (#6). Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Depends: I9e279bb20940c66eea5196f281184cb4f8a5cc5f (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 7 files changed, 80 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 19:39:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 19:39:18 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 to look at the new patch set (#7). Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Depends: I9e279bb20940c66eea5196f281184cb4f8a5cc5f (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.ok 8 files changed, 103 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 19:47:19 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 19:47:19 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/20280/3/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/20280/3/src/libmsc/msc_vty.c at 581 PS3, Line 581: for (rat=0; rat spacing I would love to have a gerrit plugin doing it. The coreboot review has something like that. https://gerrit.osmocom.org/c/osmo-msc/+/20280/3/src/libmsc/msc_vty.c at 585 PS3, Line 585: vty_out(vty, "%% paging response-timer is deprecated.%s" > Better print it in one output line, no need to bomb with several lines IMHO it's more readable in multiple lines. Having it all in one line would mean it's over 80 char/line. It's also deprecated. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 19:47:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 19:48:04 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 19:48:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Prepare NSConfiguration for non-IP providers In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 ) Change subject: NS_Emulation: Prepare NSConfiguration for non-IP providers ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 Gerrit-Change-Number: 20117 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 19:48:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 19:50:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 19:50:18 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: Hello fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 to look at the new patch set (#4). Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Convert paging response timer into an osmocom own X4 timer All timeout values should use tdef. Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 --- M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/paging.c M src/libmsc/ran_infra.c M tests/test_nodes.vty 6 files changed, 21 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/20280/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 20:12:53 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 20:12:53 +0000 Subject: Change in libosmocore[master]: ns2: fix a msg leak when receiving REJECTED messages In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20274 ) Change subject: ns2: fix a msg leak when receiving REJECTED messages ...................................................................... ns2: fix a msg leak when receiving REJECTED messages Change-Id: I7edc53c29c3dd09c395a275ceb8648b8eb19c06c --- M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index e2e0b29..e0797b6 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -453,8 +453,8 @@ goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ - frgre_sendmsg(bind, reject, &saddr); - return 0; + rc = frgre_sendmsg(bind, reject, &saddr); + goto out; case GPRS_NS2_CS_CREATED: frgre_alloc_vc(bind, nsvc, &saddr, dlci); gprs_ns2_vc_fsm_start(nsvc); diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index bda0acf..251f869 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -202,8 +202,8 @@ goto out; case GPRS_NS2_CS_REJECTED: /* nsip_sendmsg will free reject */ - nsip_sendmsg(bind, reject, &saddr); - return 0; + rc = nsip_sendmsg(bind, reject, &saddr); + goto out; case GPRS_NS2_CS_CREATED: ns2_driver_alloc_vc(bind, nsvc, &saddr); gprs_ns2_vc_fsm_start(nsvc); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc53c29c3dd09c395a275ceb8648b8eb19c06c Gerrit-Change-Number: 20274 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 21:55:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 21:55:08 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-boun... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20290 ) Change subject: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-bounds access ...................................................................... generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-bounds access Change-Id: I2ee8e8b4ba5e16b955685ba42bd58dc2ea08720f --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/20290/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 20bd620..b822a05 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -256,6 +256,9 @@ num_cell_arfcns++; } + if (num_cell_arfcns > sizeof(ts->hopping.ma_data) * 8) + num_cell_arfcns = sizeof(ts->hopping.ma_data); + /* pad it to octet-aligned number of bits */ ts->hopping.ma_len = OSMO_BYTES_FOR_BITS(num_cell_arfcns); ma->cur_bit = (ts->hopping.ma_len * 8) - 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2ee8e8b4ba5e16b955685ba42bd58dc2ea08720f Gerrit-Change-Number: 20290 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 22:55:24 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 22:55:24 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 to look at the new patch set (#8). Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC. TODO: add ipv6 test to nanobts_omlattr_test.c Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore) Depends: I9e279bb20940c66eea5196f281184cb4f8a5cc5f (libosmocore) Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/pcu_sock.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.ok 8 files changed, 102 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/20234/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 22:55:25 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 22:55:25 +0000 Subject: Change in osmo-bsc[master]: pcu_sock: use tn as variable name to improve readability References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20291 ) Change subject: pcu_sock: use tn as variable name to improve readability ...................................................................... pcu_sock: use tn as variable name to improve readability Same as used in osmo-bts Change-Id: I5c8cf0e2d29fa4999983293401294ee0a94bfa30 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/20291/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 806164d..35fe2d7 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -106,7 +106,7 @@ struct gsm_bts_gprs_nsvc *nsvc; struct gsm_bts_trx *trx; struct gsm_bts_trx_ts *ts; - int i, j; + int i, tn; OSMO_ASSERT(bts); OSMO_ASSERT(bts->network); @@ -204,17 +204,17 @@ info_ind->trx[i].hlayer1 = 0x2342; info_ind->trx[i].pdch_mask = 0; info_ind->trx[i].arfcn = trx->arfcn; - for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { - ts = &trx->ts[j]; + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + ts = &trx->ts[tn]; if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED && ts->pchan_is == GSM_PCHAN_PDCH) { - info_ind->trx[i].pdch_mask |= (1 << j); - info_ind->trx[i].tsc[j] = + info_ind->trx[i].pdch_mask |= (1 << tn); + info_ind->trx[i].tsc[tn] = (ts->tsc >= 0) ? ts->tsc : bts->bsic & 7; LOGP(DPCU, LOGL_INFO, "trx=%d ts=%d: " "available (tsc=%d arfcn=%d)\n", trx->nr, ts->nr, - info_ind->trx[i].tsc[j], + info_ind->trx[i].tsc[tn], info_ind->trx[i].arfcn); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5c8cf0e2d29fa4999983293401294ee0a94bfa30 Gerrit-Change-Number: 20291 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 22:55:25 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 22:55:25 +0000 Subject: Change in osmo-bsc[master]: pcuif_proto: protocol 9: add missing fields References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20292 ) Change subject: pcuif_proto: protocol 9: add missing fields ...................................................................... pcuif_proto: protocol 9: add missing fields The protocol 9 was extended (compatible) with * app info request * suspend request (ETWS) * rach indition (add fields ts / trx) Only copy the relevant parts but no implementation. Related: OS#4766, OS#4767, OS#4768 Change-Id: Ia81310326b093a8e473b6c69045304667b3b60f1 --- M include/osmocom/bsc/pcuif_proto.h 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/20292/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index b9f61b6..e88607e 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -3,6 +3,8 @@ #include +#define PCU_SOCK_DEFAULT "/tmp/pcu_bts" + #define PCU_IF_VERSION 0x09 #define TXT_MAX_LEN 128 @@ -10,6 +12,8 @@ #define PCU_IF_MSG_DATA_REQ 0x00 /* send data to given channel */ #define PCU_IF_MSG_DATA_CNF 0x01 /* confirm (e.g. transmission on PCH) */ #define PCU_IF_MSG_DATA_IND 0x02 /* receive data from given channel */ +#define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ +#define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ #define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (with direct tlli) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ @@ -104,6 +108,8 @@ uint16_t arfcn; uint8_t is_11bit; uint8_t burst_type; + uint8_t trx_nr; + uint8_t ts_nr; } __attribute__ ((packed)); struct gsm_pcu_if_info_trx { @@ -169,6 +175,20 @@ uint8_t identity_lv[9]; } __attribute__ ((packed)); +/* BTS tells PCU to [once] send given application data via PACCH to all UE with active TBF */ +struct gsm_pcu_if_app_info_req { + uint8_t application_type; /* 4bit field, see TS 44.060 11.2.47 */ + uint8_t len; /* length of data */ + uint8_t data[162]; /* random size choice; ETWS needs 56 bytes */ +} __attribute__ ((packed)); + +/* BTS tells PCU about a GPRS SUSPENSION REQUEST received on DCCH */ +struct gsm_pcu_if_susp_req { + uint32_t tlli; + uint8_t ra_id[6]; + uint8_t cause; +} __attribute__ ((packed)); + struct gsm_pcu_if { /* context based information */ uint8_t msg_type; /* message type */ @@ -180,6 +200,7 @@ struct gsm_pcu_if_data data_cnf; struct gsm_pcu_if_data_cnf_dt data_cnf_dt; struct gsm_pcu_if_data data_ind; + struct gsm_pcu_if_susp_req susp_req; struct gsm_pcu_if_rts_req rts_req; struct gsm_pcu_if_rach_ind rach_ind; struct gsm_pcu_if_txt_ind txt_ind; @@ -187,6 +208,7 @@ struct gsm_pcu_if_act_req act_req; struct gsm_pcu_if_time_ind time_ind; struct gsm_pcu_if_pag_req pag_req; + struct gsm_pcu_if_app_info_req app_info_req; } u; } __attribute__ ((packed)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia81310326b093a8e473b6c69045304667b3b60f1 Gerrit-Change-Number: 20292 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 22:55:25 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 22:55:25 +0000 Subject: Change in osmo-bsc[master]: pcuif_proto: version 10: add frequency hopping parameters References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20293 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... pcuif_proto: version 10: add frequency hopping parameters Related: SYS#4868, OS#4546, OS#4547 Change-Id: I5540fae66a116cbb25ec75b35145c36137146ffd --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 41 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/20293/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index e88607e..80d4f90 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -5,7 +5,7 @@ #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x09 +#define PCU_IF_VERSION 0x0a #define TXT_MAX_LEN 128 /* msg_type */ @@ -112,12 +112,21 @@ uint8_t ts_nr; } __attribute__ ((packed)); +struct gsm_pcu_if_info_trx_ts { + uint8_t tsc; + uint8_t hopping; + uint8_t hsn; + uint8_t maio; + uint8_t ma_bit_len; + uint8_t ma[8]; +} __attribute__ ((packed)); + struct gsm_pcu_if_info_trx { uint16_t arfcn; - uint8_t pdch_mask; /* PDCH channels per TS */ + uint8_t pdch_mask; /* PDCH timeslot mask */ uint8_t spare; - uint8_t tsc[8]; /* TSC per channel */ uint32_t hlayer1; + struct gsm_pcu_if_info_trx_ts ts[8]; } __attribute__ ((packed)); struct gsm_pcu_if_info_ind { diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 35fe2d7..1a0f06a 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -96,6 +96,18 @@ return msg; } +/* Fill the frequency hopping parameter */ +static void info_ind_fill_fhp(struct gsm_pcu_if_info_trx_ts *ts_info, + const struct gsm_bts_trx_ts *ts) +{ + ts_info->maio = ts->hopping.maio; + ts_info->hsn = ts->hopping.hsn; + ts_info->hopping = 0x1; + + memcpy(&ts_info->ma, ts->hopping.ma_data, ts->hopping.ma_len); + ts_info->ma_bit_len = ts->hopping.ma_len * 8 - ts->hopping.ma.cur_bit; +} + /* Send BTS properties to the PCU */ static int pcu_tx_info_ind(struct gsm_bts *bts) { @@ -206,17 +218,24 @@ info_ind->trx[i].arfcn = trx->arfcn; for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { ts = &trx->ts[tn]; - if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED - && ts->pchan_is == GSM_PCHAN_PDCH) { - info_ind->trx[i].pdch_mask |= (1 << tn); - info_ind->trx[i].tsc[tn] = + if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || + ts->pchan_is != GSM_PCHAN_PDCH) + continue; + + info_ind->trx[i].pdch_mask |= (1 << tn); + info_ind->trx[i].ts[tn].tsc = (ts->tsc >= 0) ? ts->tsc : bts->bsic & 7; - LOGP(DPCU, LOGL_INFO, "trx=%d ts=%d: " - "available (tsc=%d arfcn=%d)\n", - trx->nr, ts->nr, - info_ind->trx[i].tsc[tn], - info_ind->trx[i].arfcn); - } + + if (ts->hopping.enabled) + info_ind_fill_fhp(&info_ind->trx[i].ts[tn], ts); + + LOGP(DPCU, LOGL_INFO, "trx=%d ts=%d: PDCH is available " + "(tsc=%u ", trx->nr, ts->nr, info_ind->trx[i].ts[tn].tsc); + if (ts->hopping.enabled) + LOGPC(DPCU, LOGL_INFO, "hopping=yes hsn=%u maio=%u ma_bit_len=%u)\n", + ts->hopping.hsn, ts->hopping.maio, trx->ts[tn].hopping.ma.data_len - trx->ts[tn].hopping.ma.cur_bit); + else + LOGPC(DPCU, LOGL_INFO, "hopping=no arfcn=%u)\n", trx->arfcn); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5540fae66a116cbb25ec75b35145c36137146ffd Gerrit-Change-Number: 20293 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 22:55:25 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 22:55:25 +0000 Subject: Change in osmo-bsc[master]: pcuif_proto: version 10: add support for IPv6 NSVCs References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20294 ) Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... pcuif_proto: version 10: add support for IPv6 NSVCs Introduce a address_type in the NSVC configuration pass the given protocol. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Related: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 Related: SYS#4915 Change-Id: I740be0a401612bb5ed4e8ccd7f4be8176b936449 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/20294/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 80d4f90..8f72602 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -2,6 +2,7 @@ #define _PCUIF_PROTO_H #include +#include #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" @@ -50,6 +51,11 @@ #define PCU_IF_FLAG_MCS8 (1 << 27) #define PCU_IF_FLAG_MCS9 (1 << 28) +/* NSVC address type */ +#define PCU_IF_ADDR_TYPE_UNSPEC 0x00 /* No address - empty entry */ +#define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ +#define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -164,7 +170,11 @@ uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + uint8_t address_type[2]; + union { + struct in_addr v4; + struct in6_addr v6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 1a0f06a..dd361c4 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -205,8 +205,20 @@ nsvc = &bts->gprs.nsvc[i]; info_ind->nsvci[i] = nsvc->nsvci; info_ind->local_port[i] = nsvc->local_port; - info_ind->remote_port[i] = osmo_ntohs(nsvc->remote.u.sin.sin_port); - info_ind->remote_ip[i] = osmo_ntohl(nsvc->remote.u.sin.sin_addr.s_addr); + info_ind->remote_port[i] = nsvc->remote.u.sin.sin_port; + switch (nsvc->remote.u.sas.ss_family) { + case AF_INET: + info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV4; + info_ind->remote_ip[i].v4 = nsvc->remote.u.sin.sin_addr; + break; + case AF_INET6: + info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV6; + info_ind->remote_ip[i].v6 = nsvc->remote.u.sin6.sin6_addr; + break; + default: + info_ind->address_type[i] = PCU_IF_ADDR_TYPE_UNSPEC; + break; + } } for (i = 0; i < ARRAY_SIZE(info_ind->trx); i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I740be0a401612bb5ed4e8ccd7f4be8176b936449 Gerrit-Change-Number: 20294 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 22:58:00 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 22:58:00 +0000 Subject: Change in osmo-bts[master]: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC ... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20272 ) Change subject: Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC for PCU ...................................................................... Patch Set 2: (5 comments) This change is ready for review. https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1291 PS1, Line 1291: IPPROTO_IPIP > why not AF_INET / AF_INET6? AF_INET6 wasn't the same on all architectures I've looked onto. But pespin disliked borrowing IPPROTO, so I've created our own for PCUIF and OML. https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1291 PS1, Line 1291: case IPPROTO_IPIP: > Again, this kind of define being used here makes no sense to me, it's confusing. [?] Ack https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1292 PS1, Line 1292: /* we already checked for 10 bytes */ > No TLVP_LEN check here, as done in ipv6? it's checked already for 10 bytes. https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1295 PS1, Line 1295: memcpy(&nsvc->remote.u.sin.sin_addr.s_addr, cur, sizeof(in_addr_t)); > memcopying into sin_addr and using sizeof(struct sin_addr) is what we usually use, and may be more p [?] I'm unsure if `struct sin_addr` is being padded or not. It shouldn't be of course. So in_addr_t should be the correct type of s_addr. https://gerrit.osmocom.org/c/osmo-bts/+/20272/1/src/common/oml.c at 1302 PS1, Line 1302: nsvc->remote.u.sas.ss_family = AF_INET6; : nsvc->local.u.sas.ss_family = AF_INET; > are we sure local shouldn't be AF_INET6? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I310699fabbfec4255f0474f31717f215c1201eca Gerrit-Change-Number: 20272 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 26 Sep 2020 22:58:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Sep 26 23:00:39 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 Sep 2020 23:00:39 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-boun... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20290 ) Change subject: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-bounds access ...................................................................... Patch Set 1: I'm unsure if this is right or if it even can happen (because it doesn't make sense to have more than 64 trx per bts). @fixeria: I stumpled into it while migrating your frequency hopping patch for osmo-bsc. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2ee8e8b4ba5e16b955685ba42bd58dc2ea08720f Gerrit-Change-Number: 20290 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 26 Sep 2020 23:00:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Sep 27 01:37:41 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 Sep 2020 01:37:41 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f6fecf1c19be_25bb2af2c93dc5fc102554e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 110s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 110s] [COMPILING libboard/qmod/source/card_pres.c] [ 110s] [COMPILING libboard/qmod/source/wwan_led.c] [ 111s] [COMPILING libboard/qmod/source/i2c.c] [ 111s] [COMPILING libboard/qmod/source/board_qmod.c] [ 111s] [COMPILING apps/dfu/main.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 111s] Memory region Used Size Region Size %age Used [ 111s] rom: 16588 B 16 KB 101.25% [ 111s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 111s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 111s] collect2: error: ld returned 1 exit status [ 111s] % [ 111s] make[2]: *** [Makefile:234: flash] Error 1 [ 111s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 111s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 111s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 111s] dh_auto_build: error: make -j1 returned exit code 2 [ 111s] make: *** [debian/rules:16: build] Error 25 [ 111s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 111s] ### VM INTERACTION START ### [ 114s] [ 105.489872] sysrq: Power Off [ 114s] [ 105.492934] reboot: Power down [ 114s] ### VM INTERACTION END ### [ 114s] [ 114s] sheep87 failed "build simtrace2_0.7.0.63.39070.dsc" at Sun Sep 27 01:37:39 UTC 2020. [ 114s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Sep 27 09:13:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 09:13:44 +0000 Subject: Change in libosmocore[master]: write_queue: Add osmo_wqueue_enqueue_quiet() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20295 ) Change subject: write_queue: Add osmo_wqueue_enqueue_quiet() ...................................................................... write_queue: Add osmo_wqueue_enqueue_quiet() Same as osmo_wqueue_enqueue() but without logging queue overruns. Change-Id: Ic082eb39795b08631284eeb421fef3c28f2e90dc --- M include/osmocom/core/write_queue.h M src/write_queue.c 2 files changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/20295/1 diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 071621d..75d5d8f 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -53,6 +53,7 @@ void osmo_wqueue_init(struct osmo_wqueue *queue, int max_length); void osmo_wqueue_clear(struct osmo_wqueue *queue); int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data); +int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what); /*! @} */ diff --git a/src/write_queue.c b/src/write_queue.c index 3399b0f..c7dedc4 100644 --- a/src/write_queue.c +++ b/src/write_queue.c @@ -100,6 +100,23 @@ INIT_LLIST_HEAD(&queue->msg_queue); } +/*! Enqueue a new \ref msgb into a write queue (without logging full queue events) + * \param[in] queue Write queue to be used + * \param[in] data to-be-enqueued message buffer + * \returns 0 on success; negative on error + */ +int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data) +{ + if (queue->current_length >= queue->max_length) + return -ENOSPC; + + ++queue->current_length; + msgb_enqueue(&queue->msg_queue, data); + queue->bfd.when |= OSMO_FD_WRITE; + + return 0; +} + /*! Enqueue a new \ref msgb into a write queue * \param[in] queue Write queue to be used * \param[in] data to-be-enqueued message buffer @@ -113,11 +130,7 @@ return -ENOSPC; } - ++queue->current_length; - msgb_enqueue(&queue->msg_queue, data); - queue->bfd.when |= OSMO_FD_WRITE; - - return 0; + return osmo_wqueue_enqueue_quiet(queue, data); } /*! Clear a \ref osmo_wqueue -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic082eb39795b08631284eeb421fef3c28f2e90dc Gerrit-Change-Number: 20295 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 09:13:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 09:13:48 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 208 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 36ce941..6c1199a 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -289,8 +289,11 @@ union { struct { + /* direct, blocking output via stdio */ FILE *out; const char *fname; + /* indirect output via write_queue and osmo_select_main() */ + struct osmo_wqueue *wqueue; } tgt_file; struct { @@ -393,6 +396,7 @@ bool ofd_wq_mode, bool add_sink); int log_target_file_reopen(struct log_target *tgt); +int log_target_file_switch_to_wqueue(struct log_target *tgt); int log_targets_reopen(void); void log_add_target(struct log_target *target); diff --git a/src/logging.c b/src/logging.c index 212b0b9..6bab54e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef HAVE_STRINGS_H #include @@ -46,6 +47,9 @@ #include #include +#include +#include +#include #include #include @@ -53,9 +57,14 @@ #include #include #include +#include +#include #include /* for LOGGING_STR. */ +/* maximum number of log statements we queue in file/stderr target write queue */ +#define LOG_WQUEUE_LEN 1024 + osmo_static_assert(_LOG_CTX_COUNT <= ARRAY_SIZE(((struct log_context*)NULL)->ctx), enum_logging_ctx_items_fit_in_struct_log_context); osmo_static_assert(_LOG_FLT_COUNT <= ARRAY_SIZE(((struct log_target*)NULL)->filter_data), @@ -831,11 +840,33 @@ } #if (!EMBEDDED) +/* output via buffered, blocking stdio streams */ +static void _file_output_stream(struct log_target *target, unsigned int level, + const char *log) +{ + OSMO_ASSERT(target->tgt_file.out); + fprintf(target->tgt_file.out, "%s", log); + fflush(target->tgt_file.out); +} + +/* output via non-blocking write_queue, doing internal buffering */ static void _file_output(struct log_target *target, unsigned int level, const char *log) { - fprintf(target->tgt_file.out, "%s", log); - fflush(target->tgt_file.out); + unsigned int len = strlen(log); + struct msgb *msg; + + OSMO_ASSERT(target->tgt_file.wqueue); + msg = msgb_alloc_c(target->tgt_file.wqueue, len, "log_file_msg"); + if (!msg) + return; + + /* we simply enqueue the log message to a write queue here, to avoid any blocking + * writes on the output file. The write queue will tell us once the file is writable + * and call _file_wq_write_cb() */ + memcpy(msg->data, log, len); + msgb_put(msg, len); + osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); } #endif @@ -884,6 +915,83 @@ return target; } +/* write-queue tells us we should write another msgb (log line) to the output fd */ +static int _file_wq_write_cb(struct osmo_fd *ofd, struct msgb *msg) +{ + int rc; + + rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); + if (rc < 0) + return rc; + if (rc != msgb_length(msg)) + return -EIO; + return 0; +} + +/*! switch from blocking + buffered file output to non-blocking write-queue based output. + * \param[in] target log target which we should switch + * \return 0 on success; 1 if already switched before; negative on error */ +int log_target_file_switch_to_wqueue(struct log_target *target) +{ + struct osmo_wqueue *wq; + int rc; + + if (!target) + return -ENODEV; + + /* this only works for file/stderr targets */ + switch (target->type) { + case LOG_TGT_TYPE_FILE: + case LOG_TGT_TYPE_STDERR: + break; + default: + return -EINVAL; + } + + if (!target->tgt_file.out) { + /* target has already been switched over */ + return 1; + } + + /* we create a ~640kB sized talloc pool within the write-queue to ensure individual + * log lines (stored as msgbs) will not put result in malloc() calls, and also to + * reduce the OOM probability within logging, as the pool is already allocated */ + wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, + LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + if (!wq) + return -ENOMEM; + osmo_wqueue_init(wq, LOG_WQUEUE_LEN); + + fflush(target->tgt_file.out); + if (target->type == LOG_TGT_TYPE_FILE) { + rc = open(target->tgt_file.fname, O_WRONLY|O_APPEND|O_NONBLOCK, 0660); + if (rc < 0) { + talloc_free(wq); + return -errno; + } + } else { + rc = STDERR_FILENO; + } + wq->bfd.fd = rc; + wq->bfd.when = OSMO_FD_WRITE; + wq->write_cb = _file_wq_write_cb; + + rc = osmo_fd_register(&wq->bfd); + if (rc < 0) { + talloc_free(wq); + return -EIO; + } + target->tgt_file.wqueue = wq; + target->output = _file_output; + + /* now that everything succeeded, we can finally close the old output stream */ + if (target->type == LOG_TGT_TYPE_FILE) + fclose(target->tgt_file.out); + target->tgt_file.out = NULL; + + return 0; +} + /*! Create the STDERR log target * \returns dynamically-allocated \ref log_target for STDERR */ struct log_target *log_target_create_stderr(void) @@ -898,7 +1006,7 @@ target->type = LOG_TGT_TYPE_STDERR; target->tgt_file.out = stderr; - target->output = _file_output; + target->output = _file_output_stream; return target; #else return NULL; @@ -906,11 +1014,11 @@ } #if (!EMBEDDED) -/*! Create a new file-based log target +/*! Create a new file-based log target using buffered, blocking stream output * \param[in] fname File name of the new log file * \returns Log target in case of success, NULL otherwise */ -struct log_target *log_target_create_file(const char *fname) +struct log_target *log_target_create_file_stream(const char *fname) { struct log_target *target; @@ -924,9 +1032,55 @@ log_target_destroy(target); return NULL; } + target->output = _file_output_stream; + target->tgt_file.fname = talloc_strdup(target, fname); + return target; +} + +/*! Create a new file-based log target using non-blocking write_queue + * \param[in] fname File name of the new log file + * \returns Log target in case of success, NULL otherwise + */ +struct log_target *log_target_create_file(const char *fname) +{ + struct log_target *target; + struct osmo_wqueue *wq; + int rc; + + target = log_target_create(); + if (!target) + return NULL; + + target->type = LOG_TGT_TYPE_FILE; + /* we create a ~640kB sized talloc pool within the write-queue to ensure individual + * log lines (stored as msgbs) will not put result in malloc() calls, and also to + * reduce the OOM probability within logging, as the pool is already allocated */ + wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, + LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + if (!wq) { + log_target_destroy(target); + return NULL; + } + osmo_wqueue_init(wq, LOG_WQUEUE_LEN); + wq->bfd.fd = open(fname, O_WRONLY|O_APPEND|O_NONBLOCK, 0660); + if (wq->bfd.fd < 0) { + talloc_free(wq); + log_target_destroy(target); + return NULL; + } + wq->bfd.when = OSMO_FD_WRITE; + wq->write_cb = _file_wq_write_cb; + + rc = osmo_fd_register(&wq->bfd); + if (rc < 0) { + talloc_free(wq); + log_target_destroy(target); + return NULL; + } + + target->tgt_file.wqueue = wq; target->output = _file_output; - target->tgt_file.fname = talloc_strdup(target, fname); return target; @@ -966,6 +1120,7 @@ * \param[in] target log target to unregister, close and delete */ void log_target_destroy(struct log_target *target) { + struct osmo_wqueue *wq; /* just in case, to make sure we don't have any references */ log_del_target(target); @@ -973,10 +1128,20 @@ #if (!EMBEDDED) switch (target->type) { case LOG_TGT_TYPE_FILE: - if (target->tgt_file.out == NULL) - break; - fclose(target->tgt_file.out); - target->tgt_file.out = NULL; + if (target->tgt_file.out) { + fclose(target->tgt_file.out); + target->tgt_file.out = NULL; + } + wq = target->tgt_file.wqueue; + if (wq) { + close(wq->bfd.fd); + osmo_fd_unregister(&wq->bfd); + osmo_wqueue_clear(wq); + talloc_free(wq); + target->tgt_file.wqueue = NULL; + } + talloc_free((void *)target->tgt_file.fname); + target->tgt_file.fname = NULL; break; #ifdef HAVE_SYSLOG_H case LOG_TGT_TYPE_SYSLOG: @@ -997,13 +1162,33 @@ * \returns 0 in case of success; negative otherwise */ int log_target_file_reopen(struct log_target *target) { - fclose(target->tgt_file.out); + struct osmo_wqueue *wq; + int rc; - target->tgt_file.out = fopen(target->tgt_file.fname, "a"); - if (!target->tgt_file.out) - return -errno; + OSMO_ASSERT(target->type == LOG_TGT_TYPE_FILE || target->type == LOG_TGT_TYPE_STDERR); + OSMO_ASSERT(target->tgt_file.out || target->tgt_file.wqueue); - /* we assume target->output already to be set */ + if (target->tgt_file.out) { + fclose(target->tgt_file.out); + target->tgt_file.out = fopen(target->tgt_file.fname, "a"); + if (!target->tgt_file.out) + return -errno; + } else { + wq = target->tgt_file.wqueue; + osmo_fd_unregister(&wq->bfd); + if (wq->bfd.fd >= 0) { + close(wq->bfd.fd); + wq->bfd.fd = -1; + } + + rc = open(target->tgt_file.fname, O_WRONLY|O_APPEND|O_NONBLOCK, 0660); + if (rc < 0) + return -errno; + wq->bfd.fd = rc; + rc = osmo_fd_register(&wq->bfd); + if (rc < 0) + return rc; + } return 0; } diff --git a/src/select.c b/src/select.c index 496beea..17f409f 100644 --- a/src/select.c +++ b/src/select.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "../config.h" @@ -277,6 +278,9 @@ osmo_panic("You cannot use the 'select' volatile " "context if you don't use osmo_select_main_ctx()!\n"); } + /* We now know this application is using osmo_select_main() and hence can switch the stderr + * log target from buffered, stream based I/O to non-blocking write-queue */ + log_target_file_switch_to_wqueue(osmo_stderr_target); #endif return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 09:15:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 09:15:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Prepare NSConfiguration for non-IP providers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 ) Change subject: NS_Emulation: Prepare NSConfiguration for non-IP providers ...................................................................... NS_Emulation: Prepare NSConfiguration for non-IP providers NSConfiguration currently contains parameters relevant only for IP based transport. Move IP/UDP parameters into a sub-structure in anticipation of Frame Relay support. Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 --- M library/NS_Emulation.ttcn M library/NS_Provider_IPL4.ttcn M library/RAW_NS.ttcn M pcu/PCU_Tests.cfg M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_SNS.ttcn M pcu/SGSN_Components.ttcn M sgsn/SGSN_Tests.cfg M sgsn/SGSN_Tests.ttcn 9 files changed, 109 insertions(+), 69 deletions(-) Approvals: lynxis lazus: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 97a48e5..a0b24c9 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -131,12 +131,18 @@ timer Tns_block := 10.0; } - type record NSConfiguration { + type record NSConfigurationIP { AddressFamily address_family, PortNumber local_udp_port, charstring local_ip, PortNumber remote_udp_port, - charstring remote_ip, + charstring remote_ip + }; + type union NSConfigurationP { + NSConfigurationIP ip + }; + type record NSConfiguration { + NSConfigurationP provider, Nsvci nsvci, Nsvci nsei, boolean role_sgsn, @@ -216,7 +222,7 @@ /* FIXME */ } - [config.role_sgsn and config.handle_sns] as_sns_sgsn(); + [config.role_sgsn and config.handle_sns and ischosen(config.provider.ip)] as_sns_sgsn(); /* default case of handling unknown PDUs */ [] NSCP.receive(PDU_NS: ?) -> value rf { @@ -238,11 +244,12 @@ self.stop; } [] NSCP.receive(tr_SNS_CONFIG(config.nsei, true, - {tr_SNS_IPv4(config.remote_ip, config.remote_udp_port)})) -> value rf { + {tr_SNS_IPv4(config.provider.ip.remote_ip, + config.provider.ip.remote_udp_port)})) -> value rf { /* blindly acknowledge whatever the PCU sends */ NSCP.send(ts_SNS_CONFIG_ACK(config.nsei, omit)); /* send a SNS-CONFIG in response and expect a SNS-CONFIG-ACK */ - var IP4_Elements v4 := { valueof(ts_SNS_IPv4(config.local_ip, config.local_udp_port)) }; + var IP4_Elements v4 := { valueof(ts_SNS_IPv4(config.provider.ip.local_ip, config.provider.ip.local_udp_port)) }; NSCP.send(ts_SNS_CONFIG(config.nsei, true, v4)); alt { [] NSCP.receive(tr_SNS_CONFIG_ACK(config.nsei, omit)) { diff --git a/library/NS_Provider_IPL4.ttcn b/library/NS_Provider_IPL4.ttcn index 8ab8caa..1414935 100644 --- a/library/NS_Provider_IPL4.ttcn +++ b/library/NS_Provider_IPL4.ttcn @@ -27,12 +27,12 @@ /* connect socket */ map(self:IPL4, system:IPL4); - var Result res := f_IPL4_connect(IPL4, config.remote_ip, config.remote_udp_port, config.local_ip, - config.local_udp_port, 0, { udp := {}}); + var Result res := f_IPL4_connect(IPL4, config.provider.ip.remote_ip, + config.provider.ip.remote_udp_port, + config.provider.ip.local_ip, + config.provider.ip.local_udp_port, 0, { udp := {}}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect NS UDP socket from " & - config.local_ip & ":" & int2str(config.local_udp_port) & - " to " & config.remote_ip & ":" & int2str(config.remote_udp_port)); + setverdict(fail, "Could not connect NS UDP socket ", config.provider.ip); mtc.stop; } g_conn_id := res.connId; diff --git a/library/RAW_NS.ttcn b/library/RAW_NS.ttcn index d02f4ca..dca352f 100644 --- a/library/RAW_NS.ttcn +++ b/library/RAW_NS.ttcn @@ -50,14 +50,15 @@ g_nsconfig[idx] := ns_config; /* adjust those parts different for each NS-VC */ g_nsconfig[idx].nsvci := ns_config.nsvci + idx; - g_nsconfig[idx].local_udp_port := ns_config.local_udp_port + idx + tc_offset; + g_nsconfig[idx].provider.ip.local_udp_port := ns_config.provider.ip.local_udp_port + idx + tc_offset; } map(self:NSCP[idx], system:NSCP); /* Connect the UDP socket */ - log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); - res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, - g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); + var NSConfiguration nscfg := g_nsconfig[idx]; + log("connecting NSCP[", idx, "] to ", nscfg); + res := f_IPL4_connect(NSCP[idx], nscfg.provider.ip.remote_ip, nscfg.provider.ip.remote_udp_port, + nscfg.provider.ip.local_ip, nscfg.provider.ip.local_udp_port, 0, { udp := {}}); if (not ispresent(res.connId)) { setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); mtc.stop; diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index 7681544..e7bba18 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -8,11 +8,15 @@ [MODULE_PARAMETERS] SGSN_Components.mp_nsconfig := { - address_family := AF_INET, - local_ip := "127.0.0.1", - local_udp_port := 23000, - remote_ip := "127.0.0.1", - remote_udp_port := 22000, + provider := { + ip := { + address_family := AF_INET, + local_ip := "127.0.0.1", + local_udp_port := 23000, + remote_ip := "127.0.0.1", + remote_udp_port := 22000 + } + }, nsvci := 1234, nsei := 1234 } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 0bd7093..f68485a 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -98,10 +98,10 @@ initial_cs := 2, initial_mcs := 6, nsvci := { mp_nsconfig.nsvci, 0 }, - local_port := { mp_nsconfig.remote_udp_port, 0 }, - remote_port := { mp_nsconfig.local_udp_port, 0 }, + local_port := { mp_nsconfig.provider.ip.remote_udp_port, 0 }, + remote_port := { mp_nsconfig.provider.ip.local_udp_port, 0 }, remote_addr := f_PCUIF_ver_INFO_RemoteAddr( - f_PCUIF_AF2addr_type(mp_nsconfig.address_family), mp_nsconfig.local_ip) + f_PCUIF_AF2addr_type(mp_nsconfig.provider.ip.address_family), mp_nsconfig.provider.ip.local_ip) } type record lqual_range { diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 192890d..524d35c 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -50,8 +50,8 @@ runs on RAW_NS_CT { log("f_incoming_sns_config(idx=", idx, ")"); var PDU_NS rx; - var template IP4_Elements v4_elem := { tr_SNS_IPv4(mp_nsconfig.remote_ip, - mp_nsconfig.remote_udp_port) }; + var template IP4_Elements v4_elem := { tr_SNS_IPv4(mp_nsconfig.provider.ip.remote_ip, + mp_nsconfig.provider.ip.remote_udp_port) }; rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v4 := v4_elem), idx); NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause))); } @@ -61,8 +61,8 @@ runs on RAW_NS_CT { log("f_outgoing_sns_config(idx=", idx, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx].local_ip, - g_nsconfig[idx].local_udp_port) } + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx].provider.ip.local_ip, + g_nsconfig[idx].provider.ip.local_udp_port) } NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx); } @@ -72,10 +72,10 @@ runs on RAW_NS_CT { log("f_outgoing_sns_config_1c1u(idx=", idx, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].local_ip, - g_nsconfig[0].local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig[1].local_ip, - g_nsconfig[1].local_udp_port, 0, 1) }; + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].provider.ip.local_ip, + g_nsconfig[0].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig[1].provider.ip.local_ip, + g_nsconfig[1].provider.ip.local_udp_port, 0, 1) }; NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx); } @@ -85,10 +85,10 @@ runs on RAW_NS_CT { log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[1].local_ip, - g_nsconfig[1].local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig[2].local_ip, - g_nsconfig[2].local_udp_port, 0, 1) }; + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[1].provider.ip.local_ip, + g_nsconfig[1].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig[2].provider.ip.local_ip, + g_nsconfig[2].provider.ip.local_udp_port, 0, 1) }; NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4))); rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx); } @@ -97,8 +97,8 @@ runs on RAW_NS_CT { log("f_outgoing_sns_add(idx_add=", idx_add, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_add].local_ip, - g_nsconfig[idx_add].local_udp_port, + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_add].provider.ip.local_ip, + g_nsconfig[idx_add].provider.ip.local_udp_port, w_sig, w_user) }; NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_ADD(g_nsconfig[idx].nsei, 23, v4))); rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, omit, v4)); @@ -108,8 +108,8 @@ runs on RAW_NS_CT { log("f_outgoing_sns_del(idx_del=", idx_del, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_del].local_ip, - g_nsconfig[idx_del].local_udp_port, + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_del].provider.ip.local_ip, + g_nsconfig[idx_del].provider.ip.local_udp_port, w_sig, w_user) }; NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_DEL(g_nsconfig[idx].nsei, 24, omit, v4))); rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 24, omit, v4)); @@ -119,8 +119,8 @@ runs on RAW_NS_CT { log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")"); var PDU_NS rx; - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_chg].local_ip, - g_nsconfig[idx_chg].local_udp_port, + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_chg].provider.ip.local_ip, + g_nsconfig[idx_chg].provider.ip.local_udp_port, w_sig, w_user) }; NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CHG_WEIGHT(g_nsconfig[idx].nsei, 25, v4))); rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 25, omit, v4)); diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn index afd4ee9..4a94c03 100644 --- a/pcu/SGSN_Components.ttcn +++ b/pcu/SGSN_Components.ttcn @@ -35,11 +35,15 @@ }; NSConfiguration mp_nsconfig := { - address_family := AF_INET, - local_udp_port := 23000, - local_ip := "127.0.0.1", - remote_udp_port := 21000, - remote_ip := "127.0.0.1", + provider := { + ip := { + address_family := AF_INET, + local_udp_port := 23000, + local_ip := "127.0.0.1", + remote_udp_port := 21000, + remote_ip := "127.0.0.1" + } + }, nsvci := 0, nsei := 2342, role_sgsn := true, diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index d5c3a4c..c4e1a33 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -14,19 +14,31 @@ [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { { - address_family := AF_INET, - local_ip := "127.0.0.103", - remote_ip := "127.0.0.10" + provider := { + ip := { + address_family := AF_INET, + local_ip := "127.0.0.103", + remote_ip := "127.0.0.10" + } + } }, { - address_family := AF_INET, - local_ip := "127.0.0.103", - remote_ip := "127.0.0.10" + provider := { + ip := { + address_family := AF_INET, + local_ip := "127.0.0.103", + remote_ip := "127.0.0.10" + } + } }, { - address_family := AF_INET, - local_ip := "127.0.0.103", - remote_ip := "127.0.0.10" + provider := { + ip := { + address_family := AF_INET, + local_ip := "127.0.0.103", + remote_ip := "127.0.0.10" + } + } } } SGSN_Tests.mp_ranap_cfg := { diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index b42020d..8a87ee2 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -69,33 +69,45 @@ NSConfigurations mp_nsconfig := { { - address_family := AF_INET, - local_udp_port := 21010, - local_ip := "127.0.0.1", - remote_udp_port := 23000, - remote_ip := "127.0.0.1", + provider := { + ip := { + address_family := AF_INET, + local_udp_port := 21010, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1" + } + }, nsvci := 97, nsei := 96, role_sgsn := false, handle_sns := false }, { - address_family := AF_INET, - local_udp_port := 21011, - local_ip := "127.0.0.1", - remote_udp_port := 23000, - remote_ip := "127.0.0.1", + provider := { + ip := { + address_family := AF_INET, + local_udp_port := 21011, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1" + } + }, nsvci := 98, nsei := 97, role_sgsn := false, handle_sns := false }, { - address_family := AF_INET, - local_udp_port := 21012, - local_ip := "127.0.0.1", - remote_udp_port := 23000, - remote_ip := "127.0.0.1", + provider := { + ip := { + address_family := AF_INET, + local_udp_port := 21012, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1" + } + }, nsvci := 99, nsei := 98, role_sgsn := false, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 Gerrit-Change-Number: 20117 Gerrit-PatchSet: 9 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 09:29:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 09:29:58 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#2). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 214 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 09:30:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 09:30:00 +0000 Subject: Change in libosmocore[master]: logging_vty: set osmo_stderr_target to NULL on "no log stderr" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20297 ) Change subject: logging_vty: set osmo_stderr_target to NULL on "no log stderr" ...................................................................... logging_vty: set osmo_stderr_target to NULL on "no log stderr" We cannot keep a reference to the old log_target around if we just destroyed/deleted it. Change-Id: I98a801cf83347a4422534d020d5ed5e2d1eb5482 --- M src/vty/logging_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/20297/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 0e1782a..bd513e3 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -797,6 +798,7 @@ } log_target_destroy(tgt); + osmo_stderr_target = NULL; RET_WITH_UNLOCK(CMD_SUCCESS); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I98a801cf83347a4422534d020d5ed5e2d1eb5482 Gerrit-Change-Number: 20297 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 09:50:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 09:50:17 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#3). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 213 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 10:20:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 10:20:50 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#4). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 213 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 10:29:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 10:29:31 +0000 Subject: Change in osmocom-bb[master]: Menu App to select highram images from phone's flash memory References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20298 ) Change subject: Menu App to select highram images from phone's flash memory ...................................................................... Menu App to select highram images from phone's flash memory Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f --- M src/target/firmware/Makefile A src/target/firmware/apps/menu/main.c 2 files changed, 355 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/98/20298/1 diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index f7235ac..28a6418 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -96,11 +96,12 @@ # # List of all applications (meant to be overridden on command line) -APPLICATIONS?=hello_world compal_dsp_dump layer1 loader rssi +APPLICATIONS?=hello_world compal_dsp_dump layer1 loader rssi menu # Applications specific env requirements APP_loader_ENVIRONMENTS=compalram highram APP_rssi_ENVIRONMENTS=* -compalram +APP_menu_ENVIRONMENTS=* -highram # Various objects that are currently linked into all applications FLASH_OBJS=flash/cfi_flash.o diff --git a/src/target/firmware/apps/menu/main.c b/src/target/firmware/apps/menu/main.c new file mode 100644 index 0000000..47aadc4 --- /dev/null +++ b/src/target/firmware/apps/menu/main.c @@ -0,0 +1,353 @@ +/* Menu for Calypso Phone to load applicatios from flash */ + +/* (C) 2013 by Andreas Eversberg + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define RAM 0x00820000 +#define MAGIC 0x0083ff00 + +enum key_codes key_code = KEY_INV; +static volatile enum key_states key_state; + +int cursor = 0, scroll_apps = 0; + +struct apps { + char name[16]; + void *start; + int len; +} apps[32]; + +int _memcmp(char *s1, char *s2, int size) +{ + int i; + + for (i = 0; i < size; i++) { + if (*s1 < *s2) + return -1; + if (*s1 > *s2) + return 1; + s1++; + s2++; + } + + return 0; +} + +static void locate_apps(void) +{ + int i, j, k; + char *p; + + memset(apps, 0, sizeof(apps)); + + for (j = 0, i = 0x010000; i < 0x200000; i += 0x10000) { + p = (char *)i; + /* check for highram header: "highram:" */ + if (!!_memcmp(p, "highram:", 8)) + continue; + p += 8; + /* check for app name after header: "highram:\n" */ + printf("found highram image at flash mem address 0x%p\n", + (char *)i); + for (k = 0; k < (int)sizeof(apps[j].name) - 1; k++) { + if (p[k] == '\n') + break; + } + if (k == sizeof(apps[j].name) - 3) { + printf("skipping: corrupt highram header, no '\\n' " + "after image name or name more larger than %d " + "digits\n", (int)sizeof(apps[j].name) - 3); + continue; + } + if (j < 9) + apps[j].name[0] = '1' + j; + else if (j == 9) + apps[j].name[0] = '0'; + else + apps[j].name[0] = ' '; + apps[j].name[1] = ' '; + memcpy(apps[j].name + 2, p, k); + apps[j].len = 0x20000; + p += k + 1; + /* p points to highram image after header */ + apps[j].start = p; + j++; + } +} + +static void wait_key_release(void) +{ + /* wait for key release */ + while (key_state == PRESSED) { + delay_ms(10); + keypad_poll(); + } +} + +static void load_app(void) +{ + static int i; + static void (*f) (void) = (void (*)(void))RAM; + + wait_key_release(); + + local_irq_disable(); + + for (i = 0; i < apps[cursor].len; i++) + ((unsigned char *)RAM)[i] = ((unsigned char *)apps[cursor].start)[i]; + f(); +} + +/* UI */ + +static void refresh_display(void) +{ +#if 0 + char text[16]; + int bat = battery_info.battery_percent; +#endif + int i; + + fb_clear(); + + /* header */ + fb_setbg(FB_COLOR_WHITE); + if (1) { + fb_setfg(FB_COLOR_BLUE); + fb_setfont(FB_FONT_HELVR08); + fb_gotoxy(0, 7); + fb_putstr("Osmocom Menu", -1); + fb_setfg(FB_COLOR_RGB(0xc0, 0xc0, 0x00)); + fb_setfont(FB_FONT_SYMBOLS); +#if 0 + fb_gotoxy(framebuffer->width - 15, 8); + if (bat >= 100 && (battery_info.flags & BATTERY_CHG_ENABLED) + && !(battery_info.flags & BATTERY_CHARGING)) + fb_putstr("@HHBC", framebuffer->width); + else { + sprintf(text, "@%c%c%cC", (bat >= 30) ? 'B':'A', + (bat >= 60) ? 'B':'A', (bat >= 90) ? 'B':'A'); + fb_putstr(text, framebuffer->width); + } +#endif + fb_gotoxy(0, 8); + fb_putstr("GGEGG", framebuffer->width); + fb_setfg(FB_COLOR_GREEN); + fb_gotoxy(0, 10); + fb_boxto(framebuffer->width - 1, 10); + } + fb_setfg(FB_COLOR_BLACK); + fb_setfont(FB_FONT_C64); + + + for (i = 0; i < 5; i++) { + if (!apps[scroll_apps + i].name) + break; + if (scroll_apps + i == cursor) { + fb_setfg(FB_COLOR_WHITE); + fb_setbg(FB_COLOR_BLUE); + } + fb_gotoxy(0, 20 + i * 10); + fb_putstr(apps[scroll_apps + i].name, + framebuffer->width); + if (scroll_apps + i == cursor) { + fb_setfg(FB_COLOR_BLACK); + fb_setbg(FB_COLOR_WHITE); + } + } + if (i == 0) { + fb_gotoxy(0, 50); + fb_putstr("No apps!", -1); + } + + fb_flush(); +} + +static void handle_key_code() +{ + if (key_code == KEY_INV) + return; + + switch (key_code) { + case KEY_1: + case KEY_2: + case KEY_3: + case KEY_4: + case KEY_5: + case KEY_6: + case KEY_7: + case KEY_8: + case KEY_9: + if (apps[key_code - KEY_1].len) { + cursor = key_code - KEY_1; + load_app(); + } + break; + case KEY_0: + if (apps[9].len) { + cursor = 9; + load_app(); + } + break; + case KEY_UP: + if (cursor == 0) + return; + cursor--; + if (cursor < scroll_apps) + scroll_apps = cursor; + refresh_display(); + break; + case KEY_DOWN: + if (!apps[cursor + 1].name[0]) + return; + cursor++; + if (cursor >= scroll_apps + 5) + scroll_apps = cursor - 4; + refresh_display(); + break; + case KEY_OK: + if (apps[cursor].len) + load_app(); + break; + case KEY_POWER: + wait_key_release(); + twl3025_power_off(); + break; + default: + break; + } + + key_code = KEY_INV; +} + +/* Main Program */ +const char *hr = "======================================================================\n"; + +static void key_handler(enum key_codes code, enum key_states state) +{ + key_state = state; + + if (state != PRESSED) + return; + + key_code = code; +} + +extern void putchar_asm(uint32_t c); + +static const uint8_t phone_ack[] = { 0x1b, 0xf6, 0x02, 0x00, 0x41, 0x03, 0x42 }; + +int main(void) +{ + int i; + + /* Simulate a compal loader saying "ACK" */ + for (i = 0; i < (int)sizeof(phone_ack); i++) { + putchar_asm(phone_ack[i]); + } + + board_init(0); + + puts("\n\nOsmocomBB Menu (revision " GIT_REVISION ")\n"); + puts(hr); + + fb_clear(); + + fb_setfg(FB_COLOR_BLACK); + fb_setbg(FB_COLOR_WHITE); + fb_setfont(FB_FONT_HELVB14); + + fb_gotoxy(2,20); + fb_putstr("menu",framebuffer->width-4); + + fb_setfg(FB_COLOR_RED); + fb_setbg(FB_COLOR_BLUE); + + fb_gotoxy(2,25); + fb_boxto(framebuffer->width-3,38); + + fb_setfg(FB_COLOR_WHITE); + fb_setfont(FB_FONT_HELVR08); + fb_gotoxy(8,33); + fb_putstr("osmocom-bb",framebuffer->width-4); + + fb_flush(); + + /* Dump device identification */ + dump_dev_id(); + puts(hr); + + /* Dump clock config before PLL set */ + calypso_clk_dump(); + puts(hr); + + keypad_set_handler(&key_handler); + + /* Dump clock config after PLL set */ + calypso_clk_dump(); + puts(hr); + +// display_unset_attr(DISP_ATTR_INVERT); + + locate_apps(); + + while (1) { + for (i = 0; i < 50; i++) { + keypad_poll(); + delay_ms(10); + osmo_timers_update(); + handle_key_code(); + } + refresh_display(); + } + + /* NOT REACHED */ + + twl3025_power_off(); +} + -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f Gerrit-Change-Number: 20298 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 10:42:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 27 Sep 2020 10:42:33 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Comment-Date: Sun, 27 Sep 2020 10:42:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 10:45:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 27 Sep 2020 10:45:56 +0000 Subject: Change in libosmocore[master]: write_queue: Add osmo_wqueue_enqueue_quiet() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20295 ) Change subject: write_queue: Add osmo_wqueue_enqueue_quiet() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic082eb39795b08631284eeb421fef3c28f2e90dc Gerrit-Change-Number: 20295 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 27 Sep 2020 10:45:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 10:47:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 27 Sep 2020 10:47:52 +0000 Subject: Change in libosmocore[master]: logging_vty: set osmo_stderr_target to NULL on "no log stderr" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20297 ) Change subject: logging_vty: set osmo_stderr_target to NULL on "no log stderr" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I98a801cf83347a4422534d020d5ed5e2d1eb5482 Gerrit-Change-Number: 20297 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 27 Sep 2020 10:47:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 10:58:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 27 Sep 2020 10:58:30 +0000 Subject: Change in libosmocore[master]: cosmetic: Fix typo in API doc References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20299 ) Change subject: cosmetic: Fix typo in API doc ...................................................................... cosmetic: Fix typo in API doc Change-Id: I2c8f61768f96eda8d9f3e9b867a7e9625f4f6078 --- M src/msgb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/20299/1 diff --git a/src/msgb.c b/src/msgb.c index 4edbdf3..fbb157a 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -64,7 +64,7 @@ #include #include -/*! Allocate a new message buffer from given talloc cotext +/*! Allocate a new message buffer from given talloc context * \param[in] ctx talloc context from which to allocate * \param[in] size Length in octets, including headroom * \param[in] name Human-readable name to be associated with msgb -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c8f61768f96eda8d9f3e9b867a7e9625f4f6078 Gerrit-Change-Number: 20299 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 11:08:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 11:08:34 +0000 Subject: Change in osmocom-bb[master]: firmware: implement reading of factory RF calibration values In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/12887 ) Change subject: firmware: implement reading of factory RF calibration values ...................................................................... Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/12887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icf2693b751d86ec1d2563412d606c13d4c91a806 Gerrit-Change-Number: 12887 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 11:25:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 11:25:11 +0000 Subject: Change in osmocom-bb[master]: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20300 ) Change subject: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable ...................................................................... fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable To make the situation about stdint.h even more complicated, this toolchain doesn't anymore #define __int8_t_defined, which means we again run into conflicting definitions :/ Let's try to use INT8_MAX as a key. Change-Id: I1a74cdcd03366390e88b2d5bddf01329410b9f1c --- M src/target/firmware/include/stdint.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/00/20300/1 diff --git a/src/target/firmware/include/stdint.h b/src/target/firmware/include/stdint.h index 627403f..5997f43 100644 --- a/src/target/firmware/include/stdint.h +++ b/src/target/firmware/include/stdint.h @@ -19,7 +19,7 @@ #include_next #endif -#ifndef __int8_t_defined +#if (!defined(__int8_t_defined) && !defined(INT8_MAX)) typedef signed char int8_t; typedef unsigned char uint8_t; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1a74cdcd03366390e88b2d5bddf01329410b9f1c Gerrit-Change-Number: 20300 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 11:52:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 27 Sep 2020 11:52:23 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 4: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c at 856 PS4, Line 856: unsigned int len = strlen(log); Would be great checking if strlen() is already done in caller of output() function, to see if we can avoid recalculating it here by passing it as a parameter. https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c at 869 PS4, Line 869: osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); here it fails if wqueue is too full right? What about manually introducing a last msgb with content "QUEUE WAS FULL", that should be helpful. https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c at 926 PS4, Line 926: if (rc != msgb_length(msg)) Here, upon short write (possible if we are in NONBLOCK afaiu) instead of returning error and losing logging data, we should recreate a new msgb and prepend it to the queue so it's printed next time writing is available. https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/select.c File src/select.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/select.c at 283 PS4, Line 283: log_target_file_switch_to_wqueue(osmo_stderr_target); Fine with doing this by default, but it may make sense to have a VTY command to set a flag to avoid doing this here, or calling it explicitly if it's explicitly enabled in VTY. This way you can control this regardless of use of osmo_select_main while still allowing for default sane options. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 27 Sep 2020 11:52:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 11:53:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 27 Sep 2020 11:53:24 +0000 Subject: Change in osmocom-bb[master]: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20300 ) Change subject: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1a74cdcd03366390e88b2d5bddf01329410b9f1c Gerrit-Change-Number: 20300 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 27 Sep 2020 11:53:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 11:55:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 27 Sep 2020 11:55:28 +0000 Subject: Change in osmocom-bb[master]: Menu App to select highram images from phone's flash memory In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20298 ) Change subject: Menu App to select highram images from phone's flash memory ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f Gerrit-Change-Number: 20298 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 27 Sep 2020 11:55:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 14:06:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 14:06:49 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 4: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c at 869 PS4, Line 869: osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); > here it fails if wqueue is too full right? What about manually introducing a last msgb with content [?] I have a follow-up patch that introduces a rate_counter for overruns. Unconditionally adding a "last" msgb means that we would have to rate-limit those somehow. And if we e.g. are in a 'disk full' situation, none of the messages in the queue would ever be written, including that 'last message'. There's not really any "good" solution, so I think the rate_counter is the best we can do for now. https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c at 926 PS4, Line 926: if (rc != msgb_length(msg)) > Here, upon short write (possible if we are in NONBLOCK afaiu) instead of returning error and losing [?] short writes are possible, but rather unlikely. We always only write one log line/msgb every time we get out of select(). So this would mean that the kernel tells us the fd is write-able, but then we cannot even write the (few hundreds of bytes) log line. So unless we will have dozens-of-kilobytes in one log statement, I think the situation is a theoretical one. But yes,we can re-enqueue the remainder of the msgb in such a situation. https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/select.c File src/select.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/select.c at 283 PS4, Line 283: log_target_file_switch_to_wqueue(osmo_stderr_target); > Fine with doing this by default, but it may make sense to have a VTY command to set a flag to avoid [?] I would avoid adding more and more flags for use cases that we don't have yet. I think in the current code it's rather simple: non-blocking I/O if osmo_select_main() is used, and blocking I/O if it isn't (or as long as it isn't). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 27 Sep 2020 14:06:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 14:58:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 14:58:11 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#5). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 216 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 14:58:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 14:58:11 +0000 Subject: Change in libosmocore[master]: write_queue: use msgb_{en, de}queue_count() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20301 ) Change subject: write_queue: use msgb_{en,de}queue_count() ...................................................................... write_queue: use msgb_{en,de}queue_count() The write_queue.c implemetation predates the msgb_*queue_count() functions for maintaining a count alongside witha msgb queue. Let's migrate over to those implementations. Change-Id: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7 --- M src/write_queue.c 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/20301/1 diff --git a/src/write_queue.c b/src/write_queue.c index c7dedc4..422eda4 100644 --- a/src/write_queue.c +++ b/src/write_queue.c @@ -64,11 +64,9 @@ fd->when &= ~OSMO_FD_WRITE; + msg = msgb_dequeue_count(&queue->msg_queue, &queue->current_length); /* the queue might have been emptied */ - if (!llist_empty(&queue->msg_queue)) { - --queue->current_length; - - msg = msgb_dequeue(&queue->msg_queue); + if (msg) { rc = queue->write_cb(fd, msg); msgb_free(msg); @@ -110,8 +108,7 @@ if (queue->current_length >= queue->max_length) return -ENOSPC; - ++queue->current_length; - msgb_enqueue(&queue->msg_queue, data); + msgb_enqueue_count(&queue->msg_queue, data, &queue->current_length); queue->bfd.when |= OSMO_FD_WRITE; return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7 Gerrit-Change-Number: 20301 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 14:58:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 14:58:12 +0000 Subject: Change in libosmocore[master]: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20302 ) Change subject: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN ...................................................................... write_queue: Re-enqueue msgb if write_cb returns -EAGAIN By adding this functionality, the write_cb() handler can "un-dequeue" the msgb in case of some error. The msgb might have been modified meanwhile, e.g. due to a partial write already pulling some data off the head of the msgb. Change-Id: I97bb0d64ec991adf5dd0b3708e0c7cf029e03b5f --- M src/write_queue.c 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/20302/1 diff --git a/src/write_queue.c b/src/write_queue.c index 422eda4..b208b25 100644 --- a/src/write_queue.c +++ b/src/write_queue.c @@ -68,10 +68,15 @@ /* the queue might have been emptied */ if (msg) { rc = queue->write_cb(fd, msg); - msgb_free(msg); - - if (rc == -EBADF) + if (rc == -EBADF) { + msgb_free(msg); goto err_badfd; + } else if (rc == -EAGAIN) { + /* re-enqueue the msgb to the head of the queue */ + llist_add(&msg->list, &queue->msg_queue); + queue->current_length++; + } else + msgb_free(msg); if (!llist_empty(&queue->msg_queue)) fd->when |= OSMO_FD_WRITE; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I97bb0d64ec991adf5dd0b3708e0c7cf029e03b5f Gerrit-Change-Number: 20302 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 14:58:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 14:58:12 +0000 Subject: Change in libosmocore[master]: logging: Add 'length' argument to target->output() function References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20303 ) Change subject: logging: Add 'length' argument to target->output() function ...................................................................... logging: Add 'length' argument to target->output() function Pass the length of the formatted log string to the output callback function, in case it may need it. Change-Id: I0a92239831fe3d8a49a31b59073f7eb2e7e70ce6 --- M include/osmocom/core/logging.h M src/logging.c M src/logging_syslog.c M src/loggingrb.c M src/vty/logging_vty.c 5 files changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/20303/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 36ce941..318f75b 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -318,9 +318,10 @@ * \param[in] target logging target * \param[in] level log level of currnet message * \param[in] string the string that is to be written to the log + * \param[in] len the length of 'string' in octets */ void (*output) (struct log_target *target, unsigned int level, - const char *string); + const char *string, int len); /*! alternative call-back function to which the logging * framework passes the unfortmatted input arguments, diff --git a/src/logging.c b/src/logging.c index 212b0b9..8f8c33d 100644 --- a/src/logging.c +++ b/src/logging.c @@ -518,7 +518,7 @@ } err: buf[sizeof(buf)-1] = '\0'; - target->output(target, level, buf); + target->output(target, level, buf, len); } /* Catch internal logging category indexes as well as out-of-bounds indexes. @@ -832,7 +832,7 @@ #if (!EMBEDDED) static void _file_output(struct log_target *target, unsigned int level, - const char *log) + const char *log, int len) { fprintf(target->tgt_file.out, "%s", log); fflush(target->tgt_file.out); diff --git a/src/logging_syslog.c b/src/logging_syslog.c index f980689..fa457a2 100644 --- a/src/logging_syslog.c +++ b/src/logging_syslog.c @@ -58,8 +58,7 @@ return LOG_DEBUG; } -static void _syslog_output(struct log_target *target, - unsigned int level, const char *log) +static void _syslog_output(struct log_target *target, unsigned int level, const char *log, int len) { syslog(logp2syslog_level(level), "%s", log); } diff --git a/src/loggingrb.c b/src/loggingrb.c index 4a80cc8..caf6e1d 100644 --- a/src/loggingrb.c +++ b/src/loggingrb.c @@ -37,8 +37,7 @@ #include #include -static void _rb_output(struct log_target *target, - unsigned int level, const char *log) +static void _rb_output(struct log_target *target, unsigned int level, const char *log, int len) { osmo_strrb_add(target->tgt_rb.rb, log); } diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index bd513e3..10346d1 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -79,8 +79,7 @@ * */ -static void _vty_output(struct log_target *tgt, - unsigned int level, const char *line) +static void _vty_output(struct log_target *tgt, unsigned int level, const char *line, int len) { struct vty *vty = tgt->tgt_vty.vty; vty_out(vty, "%s", line); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a92239831fe3d8a49a31b59073f7eb2e7e70ce6 Gerrit-Change-Number: 20303 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 15:38:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 15:38:09 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#6). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 216 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 15:38:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 15:38:09 +0000 Subject: Change in libosmocore[master]: logging: Introduce MAX_LOG_SIZE for the magic number 4096 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20304 ) Change subject: logging: Introduce MAX_LOG_SIZE for the magic number 4096 ...................................................................... logging: Introduce MAX_LOG_SIZE for the magic number 4096 Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 --- M src/logging.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/20304/1 diff --git a/src/logging.c b/src/logging.c index 8f8c33d..704107b 100644 --- a/src/logging.c +++ b/src/logging.c @@ -56,6 +56,9 @@ #include /* for LOGGING_STR. */ +/* maximum length of the log string of a single log event (typically line) */ +#define MAX_LOG_SIZE 4096 + osmo_static_assert(_LOG_CTX_COUNT <= ARRAY_SIZE(((struct log_context*)NULL)->ctx), enum_logging_ctx_items_fit_in_struct_log_context); osmo_static_assert(_LOG_FLT_COUNT <= ARRAY_SIZE(((struct log_target*)NULL)->filter_data), @@ -390,7 +393,7 @@ unsigned int level, const char *file, int line, int cont, const char *format, va_list ap) { - char buf[4096]; + char buf[MAX_LOG_SIZE]; int ret, len = 0, offset = 0, rem = sizeof(buf); const char *c_subsys = NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 Gerrit-Change-Number: 20304 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 15:38:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 15:38:10 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20305 ) Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... logging: Avoid memcpy from stack to msgb in _file_output() For file and stderr output, the existing code always generates the log string on a stack buffer, and then (in case of non-blocking write via write_queue) copies it over to a msgb. Let's optimize this by turning _file_output() into a raw_output callback which first allocates the msgb and then format-prints directly to that msgb instaed of stack + memcpy. This has the disadvantage that we don't know how long the buffer has to be in order to print the entire string to it. As a result we always have to allocate a 4k-sized buffer (plus msgb overhead). The write_queue length for log file output has been decreased from 1024 entries to 156 entries in order to stay within the same memory requirements for each log target memory pool (about 648 kBytes). Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 --- M src/logging.c 1 file changed, 41 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/20305/1 diff --git a/src/logging.c b/src/logging.c index 4c0ea58..952c350 100644 --- a/src/logging.c +++ b/src/logging.c @@ -66,7 +66,7 @@ #define MAX_LOG_SIZE 4096 /* maximum number of log statements we queue in file/stderr target write queue */ -#define LOG_WQUEUE_LEN 1024 +#define LOG_WQUEUE_LEN 156 osmo_static_assert(_LOG_CTX_COUNT <= ARRAY_SIZE(((struct log_context*)NULL)->ctx), enum_logging_ctx_items_fit_in_struct_log_context); @@ -398,12 +398,23 @@ return bn + 1; } -static void _output(struct log_target *target, unsigned int subsys, - unsigned int level, const char *file, int line, int cont, - const char *format, va_list ap) +/*! main output formatting function for log lines. + * \param[out] buf caller-allocated output buffer for the generated string + * \param[in] buf_len number of bytes availale in buf + * \param[in] target log target for which the string is to be formatted + * \param[in] subsys Log sub-system number + * \param[in] level Log level + * \param[in] file name of source code file generating the log + * \param[in] line line source code line number within 'file' generating the log + * \param[in] cont is this a continuation (true) or not (false) + * \param[in] format format string + * \param[in] ap variable argument list for format + * \returns number of bytes written to out */ +static int _output_buf(char *buf, int buf_len, struct log_target *target, unsigned int subsys, + unsigned int level, const char *file, int line, int cont, + const char *format, va_list ap) { - char buf[MAX_LOG_SIZE]; - int ret, len = 0, offset = 0, rem = sizeof(buf); + int ret, len = 0, offset = 0, rem = buf_len; const char *c_subsys = NULL; /* are we using color */ @@ -529,8 +540,20 @@ OSMO_SNPRINTF_RET(ret, rem, offset, len); } err: - buf[sizeof(buf)-1] = '\0'; - target->output(target, level, buf, len); + buf[buf_len-1] = '\0'; + return len; +} + +/* Format the log line for given target; use a stack buffer and call target->output */ +static void _output(struct log_target *target, unsigned int subsys, + unsigned int level, const char *file, int line, int cont, + const char *format, va_list ap) +{ + char buf[MAX_LOG_SIZE]; + int rc; + + rc = _output_buf(buf, sizeof(buf), target, subsys, level, file, line, cont, format, ap); + target->output(target, level, buf, rc); } /* Catch internal logging category indexes as well as out-of-bounds indexes. @@ -853,21 +876,21 @@ } /* output via non-blocking write_queue, doing internal buffering */ -static void _file_output(struct log_target *target, unsigned int level, - const char *log, int len) +static void _file_raw_output(struct log_target *target, int subsys, unsigned int level, const char *file, + int line, int cont, const char *format, va_list ap) { struct msgb *msg; OSMO_ASSERT(target->tgt_file.wqueue); - msg = msgb_alloc_c(target->tgt_file.wqueue, len, "log_file_msg"); + msg = msgb_alloc_c(target->tgt_file.wqueue, MAX_LOG_SIZE, "log_file_msg"); if (!msg) return; /* we simply enqueue the log message to a write queue here, to avoid any blocking * writes on the output file. The write queue will tell us once the file is writable * and call _file_wq_write_cb() */ - memcpy(msg->data, log, len); - msgb_put(msg, len); + rc = _output_buf((char *)msgb_data(msg), msgb_tailroom(msg), target, subsys, level, file, line, cont, format, ap); + msgb_put(msg, rc); osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); } #endif @@ -1009,7 +1032,7 @@ * log lines (stored as msgbs) will not put result in malloc() calls, and also to * reduce the OOM probability within logging, as the pool is already allocated */ wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, - LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + LOG_WQUEUE_LEN*(sizeof(struct msgb)+MAX_LOG_SIZE)); if (!wq) return -ENOMEM; osmo_wqueue_init(wq, LOG_WQUEUE_LEN); @@ -1034,7 +1057,8 @@ return -EIO; } target->tgt_file.wqueue = wq; - target->output = _file_output; + target->raw_output = _file_raw_output; + target->output = NULL; /* now that everything succeeded, we can finally close the old output stream */ if (target->type == LOG_TGT_TYPE_FILE) @@ -1063,7 +1087,7 @@ * log lines (stored as msgbs) will not put result in malloc() calls, and also to * reduce the OOM probability within logging, as the pool is already allocated */ wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, - LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + LOG_WQUEUE_LEN*(sizeof(struct msgb)+MAX_LOG_SIZE)); if (!wq) { log_target_destroy(target); return NULL; @@ -1086,7 +1110,7 @@ } target->tgt_file.wqueue = wq; - target->output = _file_output; + target->raw_output = _file_raw_output; target->tgt_file.fname = talloc_strdup(target, fname); return target; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 15:38:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 15:38:10 +0000 Subject: Change in libosmocore[master]: WIP: add rate_ctr_group to log_target References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20306 ) Change subject: WIP: add rate_ctr_group to log_target ...................................................................... WIP: add rate_ctr_group to log_target This way we account for the number of dropped log messages at write_queue overflow. However, log targets have no numerical ID and hence we're not able to extract them in a reasonable manner. Change-Id: I89b696311b823267e05d6a3e85b92c1784b220ed --- M include/osmocom/core/logging.h M src/logging.c M tests/ctrl/ctrl_test.c 3 files changed, 43 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/20306/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 94788af..410a95e 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -10,6 +10,7 @@ #include #include #include +#include /*! Maximum number of logging contexts */ #define LOG_MAX_CTX 8 @@ -350,6 +351,9 @@ enum log_filename_type print_filename2; /* Where on a log line to put the source file info. */ enum log_filename_pos print_filename_pos; + + /* Rate counters related to this target */ + struct rate_ctr_group *ctrg; }; /* use the above macros */ diff --git a/src/logging.c b/src/logging.c index 952c350..8f52a43 100644 --- a/src/logging.c +++ b/src/logging.c @@ -59,6 +59,8 @@ #include #include #include +#include +#include #include /* for LOGGING_STR. */ @@ -81,6 +83,25 @@ void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); +enum tgt_ctr { + TGT_CTR_LOG_COUNT, + TGT_CTR_REOPEN_COUNT, + TGT_CTR_DROP_COUNT, +}; +static const struct rate_ctr_desc log_target_ctr_description[] = { + { "writes", "Log write count" }, + { "repoens", "Re-open count " }, + { "drops", "Log writes dropped due to overflow" }, +}; +static const struct rate_ctr_group_desc log_target_ctrg_desc = { + .group_name_prefix = "log:target", + .group_description = "Log Target Statistics", + .num_ctr = ARRAY_SIZE(log_target_ctr_description), + .ctr_desc = log_target_ctr_description, + .class_id = OSMO_STATS_CLASS_GLOBAL, +}; + + #if (!EMBEDDED) /*! This mutex must be held while using osmo_log_target_list or any of its log_targets in a multithread program. Prevents race conditions between threads @@ -636,6 +657,8 @@ if (!should_log_to_target(tar, subsys, level)) continue; + rate_ctr_inc(&tar->ctrg->ctr[TGT_CTR_LOG_COUNT]); + /* According to the manpage, vsnprintf leaves the value of ap * in undefined state. Since _output uses vsnprintf and it may * be called several times, we have to pass a copy of ap. */ @@ -880,6 +903,7 @@ int line, int cont, const char *format, va_list ap) { struct msgb *msg; + int rc; OSMO_ASSERT(target->tgt_file.wqueue); msg = msgb_alloc_c(target->tgt_file.wqueue, MAX_LOG_SIZE, "log_file_msg"); @@ -891,10 +915,14 @@ * and call _file_wq_write_cb() */ rc = _output_buf((char *)msgb_data(msg), msgb_tailroom(msg), target, subsys, level, file, line, cont, format, ap); msgb_put(msg, rc); - osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); + rc = osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); + if (rc < 0) + rate_ctr_inc(&target->ctrg->ctr[TGT_CTR_DROP_COUNT]); } #endif +static int log_target_ctrg_idx = 0; + /*! Create a new log target skeleton * \returns dynamically-allocated log target * This funcition allocates a \ref log_target and initializes it @@ -919,6 +947,12 @@ talloc_free(target); return NULL; } + target->ctrg = rate_ctr_group_alloc(target, &log_target_ctrg_desc, log_target_ctrg_idx++); + if (!target->ctrg) { + talloc_free(target->categories); + talloc_free(target); + return NULL; + } INIT_LLIST_HEAD(&target->entry); @@ -1189,6 +1223,7 @@ } #endif + rate_ctr_group_free(target->ctrg); talloc_free(target); } @@ -1225,6 +1260,7 @@ return rc; } + rate_ctr_inc(&target->ctrg->ctr[TGT_CTR_REOPEN_COUNT]); return 0; } diff --git a/tests/ctrl/ctrl_test.c b/tests/ctrl/ctrl_test.c index b46e9ac..06e5d2c 100644 --- a/tests/ctrl/ctrl_test.c +++ b/tests/ctrl/ctrl_test.c @@ -478,8 +478,8 @@ test_deferred_cmd(); - /* Expecting root ctx + msgb root ctx + 5 logging elements */ - if (talloc_total_blocks(ctx) != 7) { + /* Expecting root ctx + msgb root ctx + 6 logging elements */ + if (talloc_total_blocks(ctx) != 8) { talloc_report_full(ctx, stdout); OSMO_ASSERT(false); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I89b696311b823267e05d6a3e85b92c1784b220ed Gerrit-Change-Number: 20306 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 15:40:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 15:40:51 +0000 Subject: Change in libosmocore[master]: cosmetic: Fix typo in API doc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20299 ) Change subject: cosmetic: Fix typo in API doc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c8f61768f96eda8d9f3e9b867a7e9625f4f6078 Gerrit-Change-Number: 20299 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 27 Sep 2020 15:40:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 15:42:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 15:42:05 +0000 Subject: Change in libosmocore[master]: cosmetic: Fix typo in API doc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20299 ) Change subject: cosmetic: Fix typo in API doc ...................................................................... cosmetic: Fix typo in API doc Change-Id: I2c8f61768f96eda8d9f3e9b867a7e9625f4f6078 --- M src/msgb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/msgb.c b/src/msgb.c index 4edbdf3..fbb157a 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -64,7 +64,7 @@ #include #include -/*! Allocate a new message buffer from given talloc cotext +/*! Allocate a new message buffer from given talloc context * \param[in] ctx talloc context from which to allocate * \param[in] size Length in octets, including headroom * \param[in] name Human-readable name to be associated with msgb -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c8f61768f96eda8d9f3e9b867a7e9625f4f6078 Gerrit-Change-Number: 20299 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 16:10:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 27 Sep 2020 16:10:55 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20305 to look at the new patch set (#2). Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... logging: Avoid memcpy from stack to msgb in _file_output() For file and stderr output, the existing code always generates the log string on a stack buffer, and then (in case of non-blocking write via write_queue) copies it over to a msgb. Let's optimize this by turning _file_output() into a raw_output callback which first allocates the msgb and then format-prints directly to that msgb instaed of stack + memcpy. This has the disadvantage that we don't know how long the buffer has to be in order to print the entire string to it. As a result we always have to allocate a 4k-sized buffer (plus msgb overhead). The write_queue length for log file output has been decreased from 1024 entries to 156 entries in order to stay within the same memory requirements for each log target memory pool (about 648 kBytes). Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 --- M src/logging.c 1 file changed, 42 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/20305/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:20:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:20:06 +0000 Subject: Change in osmocom-bb[master]: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20300 ) Change subject: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1a74cdcd03366390e88b2d5bddf01329410b9f1c Gerrit-Change-Number: 20300 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 27 Sep 2020 17:20:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:24:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:24:26 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Comment-Date: Sun, 27 Sep 2020 17:24:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:29:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:29:39 +0000 Subject: Change in libosmocore[master]: write_queue: Add osmo_wqueue_enqueue_quiet() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20295 ) Change subject: write_queue: Add osmo_wqueue_enqueue_quiet() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic082eb39795b08631284eeb421fef3c28f2e90dc Gerrit-Change-Number: 20295 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 27 Sep 2020 17:29:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:30:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:30:32 +0000 Subject: Change in libosmocore[master]: write_queue: use msgb_{en, de}queue_count() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20301 ) Change subject: write_queue: use msgb_{en,de}queue_count() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7 Gerrit-Change-Number: 20301 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 27 Sep 2020 17:30:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:32:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:32:24 +0000 Subject: Change in libosmocore[master]: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20302 ) Change subject: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I97bb0d64ec991adf5dd0b3708e0c7cf029e03b5f Gerrit-Change-Number: 20302 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 27 Sep 2020 17:32:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:32:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:32:55 +0000 Subject: Change in libosmocore[master]: logging_vty: set osmo_stderr_target to NULL on "no log stderr" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20297 ) Change subject: logging_vty: set osmo_stderr_target to NULL on "no log stderr" ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I98a801cf83347a4422534d020d5ed5e2d1eb5482 Gerrit-Change-Number: 20297 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 27 Sep 2020 17:32:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:34:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:34:52 +0000 Subject: Change in libosmocore[master]: logging: Add 'length' argument to target->output() function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20303 ) Change subject: logging: Add 'length' argument to target->output() function ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20303/1/include/osmocom/core/logging.h File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/20303/1/include/osmocom/core/logging.h at 324 PS1, Line 324: int unsigned? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a92239831fe3d8a49a31b59073f7eb2e7e70ce6 Gerrit-Change-Number: 20303 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 27 Sep 2020 17:34:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:37:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:37:33 +0000 Subject: Change in libosmocore[master]: logging: Introduce MAX_LOG_SIZE for the magic number 4096 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20304 ) Change subject: logging: Introduce MAX_LOG_SIZE for the magic number 4096 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20304/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20304/1/src/logging.c at 396 PS1, Line 396: MAX_LOG_SIZE how about '\0'? Currently "maximum length of the log string" is actually 4095. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 Gerrit-Change-Number: 20304 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 27 Sep 2020 17:37:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 17:55:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 27 Sep 2020 17:55:07 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-boun... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20290 ) Change subject: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-bounds access ...................................................................... Patch Set 1: (1 comment) > Patch Set 1: > > I'm unsure if this is right or if it even can happen (because it doesn't make sense to have more than 64 trx per bts). > @fixeria: I stumpled into it while migrating your frequency hopping patch for osmo-bsc. I think it can happen, given that we do not limit the number of channels that can be configured via the VTY interface. https://gerrit.osmocom.org/c/osmo-bsc/+/20290/1/src/osmo-bsc/osmo_bsc_main.c File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20290/1/src/osmo-bsc/osmo_bsc_main.c at 260 PS1, Line 260: num_cell_arfcns = sizeof(ts->hopping.ma_data); I think we should not silently truncate the list. Let's rather return an error and make sure that the caller would terminate the process with proper logging message? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2ee8e8b4ba5e16b955685ba42bd58dc2ea08720f Gerrit-Change-Number: 20290 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 27 Sep 2020 17:55:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Sep 27 18:00:58 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 27 Sep 2020 18:00:58 +0000 Subject: Change in osmo-msc[master]: Convert paging response timer into an osmocom own X4 timer In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20280 ) Change subject: Convert paging response timer into an osmocom own X4 timer ...................................................................... Convert paging response timer into an osmocom own X4 timer All timeout values should use tdef. Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 --- M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/paging.c M src/libmsc/ran_infra.c M tests/test_nodes.vty 6 files changed, 21 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 61fbc26..438ee08 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -172,8 +172,6 @@ */ struct llist_head trans_list; - unsigned int paging_response_timer; - /* Radio Resource Location Protocol (TS 04.31) */ struct { enum rrlp_mode mode; diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 774c767..9e3e8b3 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -72,8 +72,6 @@ net->mncc_guard_timeout = 180; net->ncss_guard_timeout = 30; - net->paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; - INIT_LLIST_HEAD(&net->trans_list); INIT_LLIST_HEAD(&net->upqueue); INIT_LLIST_HEAD(&net->neighbor_ident_list); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 46d3cf9..79b4daa 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -67,6 +67,7 @@ #include #include #include +#include static struct gsm_network *gsmnet = NULL; @@ -562,7 +563,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_msc_paging_response_timer, cfg_msc_paging_response_timer_cmd, +DEFUN_DEPRECATED(cfg_msc_paging_response_timer, cfg_msc_paging_response_timer_cmd, "paging response-timer (default|<1-65535>)", "Configure Paging\n" "Set Paging timeout, the minimum time to pass between (unsuccessful) Pagings sent towards" @@ -570,10 +571,22 @@ "Set to default timeout (" OSMO_STRINGIFY_VAL(MSC_PAGING_RESPONSE_TIMER_DEFAULT) " seconds)\n" "Set paging timeout in seconds\n") { + int rat; + int paging_response_timer; if (!strcmp(argv[0], "default")) - gsmnet->paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; + paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; else - gsmnet->paging_response_timer = atoi(argv[0]); + paging_response_timer = atoi(argv[0]); + + for (rat = 0; rat < OSMO_RAT_COUNT; rat++) { + osmo_tdef_set(msc_ran_infra[rat].tdefs, -4, paging_response_timer, OSMO_TDEF_S); + } + + vty_out(vty, "%% paging response-timer is deprecated.%s" + "%% All ran timer has been modified.%s" + "%% use 'timer X4 %s' instead%s", + VTY_NEWLINE, VTY_NEWLINE, argv[0], VTY_NEWLINE); + return CMD_SUCCESS; } @@ -773,9 +786,6 @@ vty_out(vty, " check-imei-rqd 1%s", VTY_NEWLINE); } - if (gsmnet->paging_response_timer != MSC_PAGING_RESPONSE_TIMER_DEFAULT) - vty_out(vty, " paging response-timer %u%s", gsmnet->paging_response_timer, VTY_NEWLINE); - if (gsmnet->emergency.route_to_msisdn) { vty_out(vty, " emergency-call route-to-msisdn %s%s", gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c index b288414..8fbe810 100644 --- a/src/libmsc/paging.c +++ b/src/libmsc/paging.c @@ -84,7 +84,7 @@ { int rc; struct paging_request *pr; - struct gsm_network *net = vsub->vlr->user_ctx; + int paging_response_timer; pr = talloc(vsub, struct paging_request); OSMO_ASSERT(pr); @@ -110,8 +110,9 @@ /* reduced on the first paging callback */ vlr_subscr_get(vsub, VSUB_USE_PAGING); vsub->cs.is_paging = true; + paging_response_timer = osmo_tdef_get(msc_ran_infra[vsub->cs.attached_via_ran].tdefs, -4, OSMO_TDEF_S, 10); osmo_timer_setup(&vsub->cs.paging_response_timer, paging_response_timer_cb, vsub); - osmo_timer_schedule(&vsub->cs.paging_response_timer, net->paging_response_timer, 0); + osmo_timer_schedule(&vsub->cs.paging_response_timer, paging_response_timer, 0); } llist_add_tail(&pr->entry, &vsub->cs.requests); diff --git a/src/libmsc/ran_infra.c b/src/libmsc/ran_infra.c index af40541..c0eaa1a 100644 --- a/src/libmsc/ran_infra.c +++ b/src/libmsc/ran_infra.c @@ -43,6 +43,7 @@ { .T = -1, .default_val = 5, .desc = "RAN connection Complete Layer 3, Authentication and Ciphering timeout" }, \ { .T = -2, .default_val = 30, .desc = "RAN connection release sanity timeout" }, \ { .T = -3, .default_val = 10, .desc = "Timeout to find a target BSS after Handover Required" }, \ + { .T = -4, .default_val = 10, .desc = "Paging response timeout" }, \ struct osmo_tdef msc_tdefs_geran[] = { RAN_TDEFS @@ -55,6 +56,7 @@ }; struct osmo_tdef msc_tdefs_sgs[] = { + { .T = -4, .default_val = 10, .desc = "Paging response timeout" }, {} }; diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 7337cd9..f956a12 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -58,7 +58,6 @@ check-imei-rqd (0|1|early) cs7-instance-a <0-15> cs7-instance-iu <0-15> - paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN sms-over-gsup no sms-over-gsup -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic050eb49ba0c5811b43d8d8b44145a1115fd8546 Gerrit-Change-Number: 20280 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Sep 28 02:19:14 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 28 Sep 2020 02:19:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f714831e3317_25bb2af2c93dc5fc128547a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 157s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 157s] [COMPILING libboard/qmod/source/card_pres.c] [ 157s] [COMPILING libboard/qmod/source/wwan_led.c] [ 157s] [COMPILING libboard/qmod/source/i2c.c] [ 157s] [COMPILING libboard/qmod/source/board_qmod.c] [ 157s] [COMPILING apps/dfu/main.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 158s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 158s] Memory region Used Size Region Size %age Used [ 158s] rom: 16588 B 16 KB 101.25% [ 158s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 158s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 158s] collect2: error: ld returned 1 exit status [ 158s] % [ 158s] make[2]: *** [Makefile:234: flash] Error 1 [ 158s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 158s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 158s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 158s] dh_auto_build: error: make -j1 returned exit code 2 [ 158s] make: *** [debian/rules:16: build] Error 25 [ 158s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 158s] ### VM INTERACTION START ### [ 161s] [ 150.586192] sysrq: Power Off [ 161s] [ 150.592448] reboot: Power down [ 161s] ### VM INTERACTION END ### [ 161s] [ 161s] lamb51 failed "build simtrace2_0.7.0.63.39070.dsc" at Mon Sep 28 02:18:57 UTC 2020. [ 161s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Sep 28 04:39:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 28 Sep 2020 04:39:22 +0000 Subject: Change in osmo-bts[master]: tx_power: make trx/lchan struct pointers const where possible References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20307 ) Change subject: tx_power: make trx/lchan struct pointers const where possible ...................................................................... tx_power: make trx/lchan struct pointers const where possible Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 --- M include/osmo-bts/tx_power.h M src/common/tx_power.c 2 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/20307/1 diff --git a/include/osmo-bts/tx_power.h b/include/osmo-bts/tx_power.h index 4d0457b..8f68d8a 100644 --- a/include/osmo-bts/tx_power.h +++ b/include/osmo-bts/tx_power.h @@ -62,23 +62,23 @@ } ramp; }; -int get_p_max_out_mdBm(struct gsm_bts_trx *trx); +int get_p_max_out_mdBm(const struct gsm_bts_trx *trx); -int get_p_nominal_mdBm(struct gsm_bts_trx *trx); +int get_p_nominal_mdBm(const struct gsm_bts_trx *trx); -int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_target_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan); -int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm); +int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm); -int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan); -int get_p_trxout_actual_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_trxout_actual_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_trxout_actual_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan); int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb); void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm); -int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx); +int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx); diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 08c4236..0741429 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -43,16 +43,16 @@ } /* maximum output power of the system */ -int get_p_max_out_mdBm(struct gsm_bts_trx *trx) +int get_p_max_out_mdBm(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* Add user gain, internal and external PA gain to TRX output power */ return tpp->trx_p_max_out_mdBm + tpp->user_gain_mdB + tpp->pa.nominal_gain_mdB + tpp->user_pa.nominal_gain_mdB; } /* nominal output power, i.e. OML-reduced maximum output power */ -int get_p_nominal_mdBm(struct gsm_bts_trx *trx) +int get_p_nominal_mdBm(const struct gsm_bts_trx *trx) { /* P_max_out subtracted by OML maximum power reduction IE */ return get_p_max_out_mdBm(trx) - to_mdB(trx->max_power_red); @@ -61,21 +61,21 @@ /* calculate the target total output power required, reduced by both * OML and RSL, but ignoring the attenuation required for power ramping and * thermal management */ -int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red) +int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red) { /* Pn subtracted by RSL BS Power Recudtion (in 1 dB steps) */ return get_p_nominal_mdBm(trx) - to_mdB(bs_power_red); } -int get_p_target_mdBm_lchan(struct gsm_lchan *lchan) +int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan) { return get_p_target_mdBm(lchan->ts->trx, lchan->bs_power_red); } /* calculate the actual total output power required, taking into account the * attenuation required for power ramping but not thermal management */ -int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* P_target subtracted by ramp attenuation */ return p_target_mdBm - tpp->ramp.attenuation_mdB; @@ -83,9 +83,9 @@ /* calculate the effective total output power required, taking into account the * attenuation required for power ramping and thermal management */ -int get_p_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* P_target subtracted by ramp attenuation */ return p_target_mdBm - tpp->ramp.attenuation_mdB - tpp->thermal_attenuation_mdB; @@ -93,9 +93,9 @@ /* calculate effect TRX output power required, taking into account the * attenuations required for power ramping and thermal management */ -int get_p_trxout_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_trxout_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int p_actual_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm; unsigned int arfcn = trx->arfcn; @@ -114,9 +114,9 @@ /* calculate target TRX output power required, ignoring the * attenuations required for power ramping but not thermal management */ -int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red) +int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int p_target_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm; unsigned int arfcn = trx->arfcn; @@ -132,7 +132,7 @@ /* internal PA input drive level is TRX output power */ return pa_drvlvl_mdBm; } -int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan) +int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan) { return get_p_trxout_target_mdBm(lchan->ts->trx, lchan->bs_power_red); } @@ -147,9 +147,9 @@ * attempting to register at the same time. Rather, grow the cell slowly in * radius than start with the full radius at once. */ -static int we_are_ramping_up(struct gsm_bts_trx *trx) +static int we_are_ramping_up(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; if (tpp->p_total_tgt_mdBm > tpp->p_total_cur_mdBm) return 1; @@ -298,9 +298,9 @@ } /* determine the initial transceiver output power at start-up time */ -int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx) +int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int pout_mdBm; /* this is the maximum initial output on the antenna connector -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 Gerrit-Change-Number: 20307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 04:48:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 28 Sep 2020 04:48:01 +0000 Subject: Change in osmo-bsc[master]: vty: fix unreacheable code / wrong check in lchan_act_all_trx() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20308 ) Change subject: vty: fix unreacheable code / wrong check in lchan_act_all_trx() ...................................................................... vty: fix unreacheable code / wrong check in lchan_act_all_trx() Change-Id: If7d8a108a147980d26b71836343d20b1b0b95579 Fixes: CID#214277 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/20308/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 003939b..8808c20 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5265,7 +5265,7 @@ } trx = gsm_bts_trx_num(bts, trx_nr); - if (!bts) { + if (!trx) { vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If7d8a108a147980d26b71836343d20b1b0b95579 Gerrit-Change-Number: 20308 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 05:07:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 28 Sep 2020 05:07:46 +0000 Subject: Change in osmocom-bb[master]: Menu App to select highram images from phone's flash memory In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20298 ) Change subject: Menu App to select highram images from phone's flash memory ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/c/osmocom-bb/+/20298/1/src/target/firmware/apps/menu/main.c File src/target/firmware/apps/menu/main.c: https://gerrit.osmocom.org/c/osmocom-bb/+/20298/1/src/target/firmware/apps/menu/main.c at 54 PS1, Line 54: enum static https://gerrit.osmocom.org/c/osmocom-bb/+/20298/1/src/target/firmware/apps/menu/main.c at 57 PS1, Line 57: int static https://gerrit.osmocom.org/c/osmocom-bb/+/20298/1/src/target/firmware/apps/menu/main.c at 59 PS1, Line 59: struct static https://gerrit.osmocom.org/c/osmocom-bb/+/20298/1/src/target/firmware/apps/menu/main.c at 65 PS1, Line 65: int _memcmp(char *s1, char *s2, int size) We already have memcmp() implemented in firmware/lib/memcmp.S. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f Gerrit-Change-Number: 20298 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 28 Sep 2020 05:07:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 07:51:40 2020 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Mon, 28 Sep 2020 07:51:40 +0000 Subject: Change in libusrp[master]: migrate to python3 In-Reply-To: References: Message-ID: roox has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/19675 ) Change subject: migrate to python3 ...................................................................... Patch Set 1: > Patch Set 1: > > (1 comment) Correct, this if statement should be removed entirely since it only adds compatibility for old openSUSE versions that are obsolete for nearly 3 years now. -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/19675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib1604b36c32630e1360e06567cbd5f63a78df547 Gerrit-Change-Number: 19675 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: roox Gerrit-Comment-Date: Mon, 28 Sep 2020 07:51:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 07:54:55 2020 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Mon, 28 Sep 2020 07:54:55 +0000 Subject: Change in libusrp[master]: migrate to python3 In-Reply-To: References: Message-ID: roox has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/19675 ) Change subject: migrate to python3 ...................................................................... Patch Set 1: does not work with python 3.8.5 ... [ 46s] ./../common/build_eeprom.py -p/usr -r4 eeprom_boot.ihx > burn-usrp4-eeprom [ 46s] Traceback (most recent call last): [ 46s] File "./../common/build_eeprom.py", line 189, in [ 46s] build_shell_script (sys.stdout, ihx_filename, options.rev, options.prefix) [ 46s] File "./../common/build_eeprom.py", line 146, in build_shell_script [ 46s] image = build_eeprom_image (ihx_filename, rev) [ 46s] File "./../common/build_eeprom.py", line 106, in build_eeprom_image [ 46s] (start_addr, bytes) = get_code (filename) [ 46s] File "./../common/build_eeprom.py", line 87, in get_code [ 46s] r.sort (lambda a,b: a.addr - b.addr) [ 46s] TypeError: sort() takes no positional arguments [ 46s] make[4]: *** [Makefile:674: burn-usrp2-eeprom] Error 1 [ 46s] make[4]: *** Waiting for unfinished jobs.... [ 46s] Traceback (most recent call last): [ 46s] File "./../common/build_eeprom.py", line 189, in [ 46s] build_shell_script (sys.stdout, ihx_filename, options.rev, options.prefix) [ 46s] File "./../common/build_eeprom.py", line 146, in build_shell_script [ 46s] image = build_eeprom_image (ihx_filename, rev) [ 46s] File "./../common/build_eeprom.py", line 106, in build_eeprom_image [ 46s] (start_addr, bytes) = get_code (filename) [ 46s] File "./../common/build_eeprom.py", line 87, in get_code [ 46s] r.sort (lambda a,b: a.addr - b.addr) [ 46s] TypeError: sort() takes no positional arguments [ 46s] make[4]: *** [Makefile:678: burn-usrp4-eeprom] Error 1 [ 46s] make[4]: Leaving directory '/home/abuild/rpmbuild/BUILD/libusrp-3.4.2+git.20200613/firmware/src/usrp2' [ 46s] make[3]: *** [Makefile:404: all-recursive] Error 1 [ 46s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/libusrp-3.4.2+git.20200613/firmware/src' [ 46s] make[2]: *** [Makefile:404: all-recursive] Error 1 [ 46s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/libusrp-3.4.2+git.20200613/firmware' [ 46s] make[1]: *** [Makefile:634: all-recursive] Error 1 [ 46s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/libusrp-3.4.2+git.20200613' [ 46s] make: *** [Makefile:553: all] Error 2 [ 46s] error: Bad exit status from /var/tmp/rpm-tmp.GKz9G9 (%build) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/19675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib1604b36c32630e1360e06567cbd5f63a78df547 Gerrit-Change-Number: 19675 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: roox Gerrit-Comment-Date: Mon, 28 Sep 2020 07:54:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 08:29:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 28 Sep 2020 08:29:04 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... vty/command: introduce new attribute CMD_ATTR_IMMEDIATE This attribute indicates that a VTY command applies immediately. Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Related: SYS#4937 --- M include/osmocom/vty/command.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/20309/1 diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 47d2e5f..43ad3da 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -137,6 +137,7 @@ enum { CMD_ATTR_DEPRECATED = (1 << 0), CMD_ATTR_HIDDEN = (1 << 1), + CMD_ATTR_IMMEDIATE = (1 << 2), }; /*! Structure of a command element */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 08:29:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 28 Sep 2020 08:29:26 +0000 Subject: Change in libosmocore[master]: vty/command: reflect global attributes in the XML reference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19577 ) Change subject: vty/command: reflect global attributes in the XML reference ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b Gerrit-Change-Number: 19577 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 08:29:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 08:52:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 08:52:00 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 6: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c at 869 PS4, Line 869: osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); > I have a follow-up patch that introduces a rate_counter for overruns. [?] rate_counter: ACK, fine. https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/logging.c at 926 PS4, Line 926: if (rc != msgb_length(msg)) > short writes are possible, but rather unlikely. [?] Well that's maybe the issue here. We should rather try writing as much as possible until write returns a short write, or EAGAIN or whatever meaning the buffer is full. This optimizes time spent + delay upon logging stuff, frees memory beforehand, etc. Otherwise you are removing 1 msgb per select loop while potentially adding several msgbs per loop. https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/select.c File src/select.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/4/src/select.c at 283 PS4, Line 283: log_target_file_switch_to_wqueue(osmo_stderr_target); > I would avoid adding more and more flags for use cases that we don't have yet. [?] There's a use case: debugging. When debugging some issue or crash, one wants to be sure logging is outputed synchronously. That's the point of using stderr vs stdout for instance (no bufering). You'll always get printed whatever happens before event X or a crash. By delaying the actual logging you are actually making issues look less reproducible and provide less information, so specially when reproducing an issue, one wants to disable this async logging. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 08:52:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 08:58:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 08:58:00 +0000 Subject: Change in libosmocore[master]: write_queue: use msgb_{en, de}queue_count() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20301 ) Change subject: write_queue: use msgb_{en,de}queue_count() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7 Gerrit-Change-Number: 20301 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 08:58:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:00:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:00:27 +0000 Subject: Change in libosmocore[master]: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20302 ) Change subject: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20302/1/src/write_queue.c File src/write_queue.c: https://gerrit.osmocom.org/c/libosmocore/+/20302/1/src/write_queue.c at 78 PS1, Line 78: } else missing {} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I97bb0d64ec991adf5dd0b3708e0c7cf029e03b5f Gerrit-Change-Number: 20302 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:00:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:01:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:01:06 +0000 Subject: Change in libosmocore[master]: logging: Add 'length' argument to target->output() function In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20303 ) Change subject: logging: Add 'length' argument to target->output() function ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20303/1/include/osmocom/core/logging.h File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/20303/1/include/osmocom/core/logging.h at 324 PS1, Line 324: int > unsigned? Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a92239831fe3d8a49a31b59073f7eb2e7e70ce6 Gerrit-Change-Number: 20303 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:01:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:01:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:01:52 +0000 Subject: Change in libosmocore[master]: logging: Introduce MAX_LOG_SIZE for the magic number 4096 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20304 ) Change subject: logging: Introduce MAX_LOG_SIZE for the magic number 4096 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20304/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20304/1/src/logging.c at 396 PS1, Line 396: MAX_LOG_SIZE > how about '\0'? Currently "maximum length of the log string" is actually 4095. Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 Gerrit-Change-Number: 20304 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:01:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:05:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:05:03 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20305 ) Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:05:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:05:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:05:52 +0000 Subject: Change in osmo-bts[master]: tx_power: make trx/lchan struct pointers const where possible In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20307 ) Change subject: tx_power: make trx/lchan struct pointers const where possible ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 Gerrit-Change-Number: 20307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:05:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:06:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:06:01 +0000 Subject: Change in osmo-bts[master]: vty: make most struct pointers const in show/write commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20288 ) Change subject: vty: make most struct pointers const in show/write commands ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iacc32f7982c150d84ea4df7affa1f9e07806928f Gerrit-Change-Number: 20288 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:06:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:07:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:07:03 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:07:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:07:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:07:20 +0000 Subject: Change in libosmocore[master]: vty/command: reflect global attributes in the XML reference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19577 ) Change subject: vty/command: reflect global attributes in the XML reference ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b Gerrit-Change-Number: 19577 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:07:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:13:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 09:13:57 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 to look at the new patch set (#4). Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Introduce NM operative state Radio Carrier FSM All the Operative State logic to manage a RadioCarrier NM object is centralized in this FSM, where other parts of the code simply send events to it. This allows keeping state consistent and offloading logic from each bts backend, since they are only required to submit events now. The idea in the long run is to also replace other NM objects with similar FSMs. This improved logic fixes bug where PHY + RSL link became available before OPSTART and hence op state changed to Enabled before receiving any OPSTART message. Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts_trx.h A include/osmo-bts/nm_radio_carrier_fsm.h M src/common/Makefile.am M src/common/bts_trx.c A src/common/nm_radio_carrier_fsm.c M src/common/phy_link.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 18 files changed, 361 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20284/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:13:57 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 Sep 2020 09:13:57 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:13:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 09:21:17 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 Sep 2020 09:21:17 +0000 Subject: Change in libosmocore[master]: vty/command: reflect global attributes in the XML reference In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19577 ) Change subject: vty/command: reflect global attributes in the XML reference ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b Gerrit-Change-Number: 19577 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 09:21:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 10:21:31 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 28 Sep 2020 10:21:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: ACK on SIP failure message to avoid it being retransmitted In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 ) Change subject: sip: ACK on SIP failure message to avoid it being retransmitted ...................................................................... Patch Set 1: Code-Review+1 I'm not so familiar with ttcn-3 to static analyse the code, but the theory of our exchange about it on IRC is correct. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357 Gerrit-Change-Number: 20258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 10:21:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 10:37:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 10:37:25 +0000 Subject: Change in osmo-bts[master]: gsm_data.h: Drop unused struct field References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20310 ) Change subject: gsm_data.h: Drop unused struct field ...................................................................... gsm_data.h: Drop unused struct field Probably a leftover from openbsc times. Change-Id: I0b62c41bcb992df376668c6feb6ac7ada35d471d --- M include/osmo-bts/gsm_data.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/10/20310/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index a9f65eb..3d01d55 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -322,7 +322,6 @@ unsigned int flags; struct gsm_abis_mo mo; - uint8_t nm_chan_comb; int tsc; /* -1 == use BTS TSC */ /* Frequency hopping parameters (configured via OML) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b62c41bcb992df376668c6feb6ac7ada35d471d Gerrit-Change-Number: 20310 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 10:38:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 10:38:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: ACK on SIP failure message to avoid it being retransmitted In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 ) Change subject: sip: ACK on SIP failure message to avoid it being retransmitted ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357 Gerrit-Change-Number: 20258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 10:38:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 10:38:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 10:38:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: ACK on SIP failure message to avoid it being retransmitted In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 ) Change subject: sip: ACK on SIP failure message to avoid it being retransmitted ...................................................................... sip: ACK on SIP failure message to avoid it being retransmitted Otherwise the SIP message is retransmitted by osmo-sip-connector around 10-11 times, even when next test has started, making it fail since it's not expected. Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357 --- M sip/SIP_Tests.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 534801e..053395e 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -202,14 +202,23 @@ /* OSC <- SIP: A party sends SIP invite for a MT-call into OSC */ SIP.send(ts_SIP_INVITE(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, cp.comp.sip_seq_nr, cp.comp.sip_body)); - /* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */ - MNCC.receive(tr_MNCC_SETUP_req) -> value mncc { - cp.mncc_call_id := mncc.u.signal.callref; - } /* OSC -> SIP */ SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, "INVITE", 100, ?, "Trying", *)); + alt { + /* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */ + [] MNCC.receive(tr_MNCC_SETUP_req) -> value mncc { + cp.mncc_call_id := mncc.u.signal.callref; + } + [] SIP.receive { + setverdict(fail, "Received unexpected respose"); + SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, + cp.comp.sip_seq_nr, omit)); + mtc.stop; + } + } + /* MSC -> OSC: After MS sends CALL CONF in response to SETUP */ MNCC.send(ts_MNCC_CALL_CONF_ind(cp.mncc_call_id)); /* MSC <- OSC: OSC asks MSC to create RTP socket */ @@ -223,8 +232,16 @@ /* MSC -> OSC: After MS is ringing and sent CC ALERTING */ MNCC.send(ts_MNCC_ALERT_ind(cp.mncc_call_id)); SIP.clear; - SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, - "INVITE", 180, ?, "Ringing", *)); + alt { + [] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, + "INVITE", 180, ?, "Ringing", *)); + [] SIP.receive { + setverdict(fail, "Received unexpected respose"); + SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, + cp.comp.sip_seq_nr, omit)); + mtc.stop; + } + } /* MSC -> OSC: After MT user has picked up and sent CC CONNECT */ MNCC.send(ts_MNCC_SETUP_CNF(cp.mncc_call_id)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357 Gerrit-Change-Number: 20258 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 11:22:56 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 Sep 2020 11:22:56 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... Patch Set 1: I think it would make sense to add an CMD_ATTR_RESTART as well. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 11:22:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 12:44:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 12:44:24 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 to look at the new patch set (#5). Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Introduce NM operative state Radio Carrier FSM All the Operative State logic to manage a RadioCarrier NM object is centralized in this FSM, where other parts of the code simply send events to it. This allows keeping state consistent and offloading logic from each bts backend, since they are only required to submit events now. The idea in the long run is to also replace other NM objects with similar FSMs. This improved logic fixes bug where PHY + RSL link became available before OPSTART and hence op state changed to Enabled before receiving any OPSTART message. Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts_trx.h A include/osmo-bts/nm_bb_transc_fsm.h A include/osmo-bts/nm_radio_carrier_fsm.h M src/common/Makefile.am M src/common/bts.c M src/common/bts_shutdown_fsm.c M src/common/bts_trx.c M src/common/l1sap.c A src/common/nm_bb_transc_fsm.c A src/common/nm_radio_carrier_fsm.c M src/common/oml.c M src/common/pcu_sock.c M src/common/phy_link.c M src/common/rsl.c M src/common/vty.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/calib_file.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-virtual/bts_model.c 29 files changed, 766 insertions(+), 145 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20284/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 13:00:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 13:00:28 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 to look at the new patch set (#6). Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Introduce NM operative state Radio Carrier FSM All the Operative State logic to manage a RadioCarrier NM object is centralized in this FSM, where other parts of the code simply send events to it. This allows keeping state consistent and offloading logic from each bts backend, since they are only required to submit events now. The idea in the long run is to also replace other NM objects with similar FSMs. This improved logic fixes bug where PHY + RSL link became available before OPSTART and hence op state changed to Enabled before receiving any OPSTART message. Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts_trx.h A include/osmo-bts/nm_bb_transc_fsm.h A include/osmo-bts/nm_radio_carrier_fsm.h M src/common/Makefile.am M src/common/bts.c M src/common/bts_shutdown_fsm.c M src/common/bts_trx.c M src/common/l1sap.c A src/common/nm_bb_transc_fsm.c A src/common/nm_radio_carrier_fsm.c M src/common/oml.c M src/common/pcu_sock.c M src/common/phy_link.c M src/common/rsl.c M src/common/vty.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/calib_file.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-virtual/bts_model.c 29 files changed, 767 insertions(+), 145 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20284/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 13:00:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 13:00:42 +0000 Subject: Change in osmo-bts[master]: WIP: Introduce NM Channel FSM References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20311 ) Change subject: WIP: Introduce NM Channel FSM ...................................................................... WIP: Introduce NM Channel FSM Change-Id: I288cbfb4730b25a334ef1c3d6b9679d6f1d4cfc5 --- M include/osmo-bts/Makefile.am M include/osmo-bts/gsm_data.h A include/osmo-bts/nm_channel_fsm.h M src/common/Makefile.am M src/common/bts.c M src/common/bts_trx.c M src/common/nm_bb_transc_fsm.c A src/common/nm_channel_fsm.c M src/common/oml.c M src/common/pcu_sock.c M src/common/vty.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 20 files changed, 450 insertions(+), 147 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/11/20311/1 diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index 4593f7a..45961e0 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -28,5 +28,6 @@ dtx_dl_amr_fsm.h \ ta_control.h \ nm_bb_transc_fsm.h \ + nm_channel_fsm.h \ nm_radio_carrier_fsm.h \ $(NULL) diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 3d01d55..98fb481 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -306,6 +306,13 @@ TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */ }; +struct nm_chan { + /* NM Channel FSM */ + struct osmo_fsm_inst *fi; + bool opstart_success; /* OPSTART went OK in lower layers and was acked */ + struct gsm_abis_mo mo; +}; + /* One Timeslot in a TRX */ struct gsm_bts_trx_ts { struct gsm_bts_trx *trx; @@ -321,7 +328,7 @@ } dyn; unsigned int flags; - struct gsm_abis_mo mo; + struct nm_chan nm_chan; int tsc; /* -1 == use BTS TSC */ /* Frequency hopping parameters (configured via OML) */ diff --git a/include/osmo-bts/nm_channel_fsm.h b/include/osmo-bts/nm_channel_fsm.h new file mode 100644 index 0000000..4f76db6 --- /dev/null +++ b/include/osmo-bts/nm_channel_fsm.h @@ -0,0 +1,44 @@ +/* NM Channel FSM. Following 3GPP TS 12.21 Figure 2/GSM 12.21: + GSM 12.21 Objects' Operational state and availability status behaviour during initialization */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU 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 + +enum nm_chan_op_fsm_states { + NM_CHAN_ST_OP_DISABLED_NOTINSTALLED, + NM_CHAN_ST_OP_DISABLED_DEPENDENCY, + NM_CHAN_ST_OP_DISABLED_OFFLINE, + NM_CHAN_ST_OP_ENABLED, +}; + +enum nm_chan_op_fsm_events { + NM_CHAN_EV_BBTRANSC_INSTALLED, + NM_CHAN_EV_BBTRANSC_ENABLED, + NM_CHAN_EV_BBTRANSC_DISABLED, + NM_CHAN_EV_OPSTART_ACK, + NM_CHAN_EV_OPSTART_NACK, + NM_CHAN_EV_DISABLE, +}; + +extern struct osmo_fsm nm_chan_fsm; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index fe8de46..f5ec188 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -38,6 +38,7 @@ scheduler_mframe.c \ ta_control.c \ nm_bb_transc_fsm.c \ + nm_channel_fsm.c \ nm_radio_carrier_fsm.c \ $(NULL) diff --git a/src/common/bts.c b/src/common/bts.c index 4d8445c..0ba3ce0 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -410,7 +410,7 @@ for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { struct gsm_bts_trx_ts *ts = &trx->ts[j]; - oml_tx_state_changed(&ts->mo); + oml_tx_state_changed(&ts->nm_chan.mo); } } diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 6ffae9e..9551b73 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -30,6 +30,7 @@ #include #include #include +#include struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { @@ -65,7 +66,11 @@ ts->dyn.pchan_want = GSM_PCHAN_NONE; ts->tsc = -1; - gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, + ts->nm_chan.fi = osmo_fsm_inst_alloc(&nm_chan_fsm, trx, ts, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(ts->nm_chan.fi, "bts%d-trx%d-ts%d", + bts->nr, trx->nr, ts->nr); + gsm_mo_init(&ts->nm_chan.mo, bts, NM_OC_CHANNEL, bts->nr, trx->nr, ts->nr); for (l = 0; l < TS_MAX_LCHAN; l++) { diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 6dfb2b3..57d5557 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #define X(s) (1 << (s)) @@ -55,11 +56,16 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + int i; switch (event) { case NM_BBTRANSC_EV_SW_ACT: oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); nm_bb_transc_fsm_state_chg(fi, NM_BBTRANSC_ST_OP_DISABLED_OFFLINE); + for (i = 0; i < TRX_NR_TS; i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + osmo_fsm_inst_dispatch(ts->nm_chan.fi, NM_CHAN_EV_BBTRANSC_INSTALLED, NULL); + } return; case NM_BBTRANSC_EV_RSL_UP: return; @@ -79,8 +85,17 @@ static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + int i; + trx->bb_transc.opstart_success = false; oml_mo_state_chg(&trx->bb_transc.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + + if (prev_state == NM_BBTRANSC_ST_OP_ENABLED) { + for (i = 0; i < TRX_NR_TS; i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + osmo_fsm_inst_dispatch(ts->nm_chan.fi, NM_CHAN_EV_BBTRANSC_DISABLED, NULL); + } + } } static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -127,7 +142,13 @@ static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + int i; + oml_mo_state_chg(&trx->bb_transc.mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); + for (i = 0; i < TRX_NR_TS; i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + osmo_fsm_inst_dispatch(ts->nm_chan.fi, NM_CHAN_EV_BBTRANSC_ENABLED, NULL); + } } static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c new file mode 100644 index 0000000..f2cdfb4 --- /dev/null +++ b/src/common/nm_channel_fsm.c @@ -0,0 +1,220 @@ +/* NM Radio Carrier FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU 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 +#include +#include +#include +#include + +#define X(s) (1 << (s)) + +#define nm_chan_fsm_state_chg(fi, NEXT_STATE) \ + osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0) + +////////////////////////// +// FSM STATE ACTIONS +////////////////////////// + +static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + ts->nm_chan.opstart_success = false; + oml_mo_state_chg(&ts->nm_chan.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); +} + +static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + + switch (event) { + case NM_CHAN_EV_BBTRANSC_INSTALLED: + oml_mo_tx_sw_act_rep(&ts->nm_chan.mo); + if (ts->trx->bb_transc.mo.nm_state.operational == NM_OPSTATE_ENABLED) + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); + else + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); + return; + default: + OSMO_ASSERT(0); + } +} + +static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + ts->nm_chan.opstart_success = false; + oml_mo_state_chg(&ts->nm_chan.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); +} + +static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + + switch (event) { + case NM_CHAN_EV_OPSTART_ACK: + LOGPFSML(fi, LOGL_NOTICE, "BSC trying to activate TS while still in avail=dependency. " + "Allowing it to stay backward-compatible with older osmo-bts versions, but BSC is wrong.\n"); + ts->nm_chan.opstart_success = true; + oml_mo_opstart_ack(&ts->nm_chan.mo); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED); + return; + case NM_CHAN_EV_OPSTART_NACK: + ts->nm_chan.opstart_success = false; + oml_mo_opstart_nack(&ts->nm_chan.mo, (int)(intptr_t)data); + return; + case NM_CHAN_EV_BBTRANSC_ENABLED: + oml_mo_state_chg(&ts->nm_chan.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + return; + default: + OSMO_ASSERT(0); + } +} + +static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + ts->nm_chan.opstart_success = false; + oml_mo_state_chg(&ts->nm_chan.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); +} + +static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + + switch (event) { + case NM_CHAN_EV_OPSTART_ACK: + ts->nm_chan.opstart_success = true; + oml_mo_opstart_ack(&ts->nm_chan.mo); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED); + return; + case NM_CHAN_EV_OPSTART_NACK: + ts->nm_chan.opstart_success = false; + oml_mo_opstart_nack(&ts->nm_chan.mo, (int)(intptr_t)data); + return; + case NM_CHAN_EV_BBTRANSC_DISABLED: + oml_mo_state_chg(&ts->nm_chan.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); + return; + default: + OSMO_ASSERT(0); + } +} + +static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + oml_mo_state_chg(&ts->nm_chan.mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); +} + +static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case NM_CHAN_EV_BBTRANSC_DISABLED: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); + return; + case NM_CHAN_EV_DISABLE: + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); + return; + default: + OSMO_ASSERT(0); + } +} + +static struct osmo_fsm_state nm_chan_fsm_states[] = { + [NM_CHAN_ST_OP_DISABLED_NOTINSTALLED] = { + .in_event_mask = + X(NM_CHAN_EV_BBTRANSC_INSTALLED), + .out_state_mask = + X(NM_CHAN_ST_OP_DISABLED_OFFLINE) | + X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY), + .name = "DISABLED_NOTINSTALLED", + .onenter = st_op_disabled_notinstalled_on_enter, + .action = st_op_disabled_notinstalled, + }, + [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { + .in_event_mask = + X(NM_CHAN_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */ + X(NM_CHAN_EV_OPSTART_NACK) | + X(NM_CHAN_EV_BBTRANSC_ENABLED), + .out_state_mask = + X(NM_CHAN_ST_OP_DISABLED_OFFLINE) | + X(NM_CHAN_ST_OP_ENABLED), /* backward compatibility, buggy BSC */ + .name = "DISABLED_DEPENDENCY", + .onenter = st_op_disabled_dependency_on_enter, + .action = st_op_disabled_dependency, + }, + [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { + .in_event_mask = + X(NM_CHAN_EV_OPSTART_ACK) | + X(NM_CHAN_EV_OPSTART_NACK) | + X(NM_CHAN_EV_BBTRANSC_DISABLED), + .out_state_mask = + X(NM_CHAN_ST_OP_ENABLED) | + X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY), + .name = "DISABLED_OFFLINE", + .onenter = st_op_disabled_offline_on_enter, + .action = st_op_disabled_offline, + }, + [NM_CHAN_ST_OP_ENABLED] = { + .in_event_mask = + X(NM_CHAN_EV_BBTRANSC_DISABLED) | + X(NM_CHAN_EV_DISABLE), + .out_state_mask = + X(NM_CHAN_ST_OP_DISABLED_OFFLINE) | + X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY), + .name = "ENABLED", + .onenter = st_op_enabled_on_enter, + .action = st_op_enabled, + }, +}; + +const struct value_string nm_chan_fsm_event_names[] = { + { NM_CHAN_EV_BBTRANSC_INSTALLED, "BBTRANSC_INSTALLED" }, + { NM_CHAN_EV_BBTRANSC_ENABLED, "BBTRANSC_ENABLED" }, + { NM_CHAN_EV_BBTRANSC_DISABLED, "BBTRANSC_DISABLED" }, + { NM_CHAN_EV_OPSTART_ACK, "OPSTART_ACK" }, + { NM_CHAN_EV_OPSTART_NACK, "OPSTART_NACK" }, + { NM_CHAN_EV_DISABLE, "DISABLE" }, + { 0, NULL } +}; + +struct osmo_fsm nm_chan_fsm = { + .name = "NM_CHAN_OP", + .states = nm_chan_fsm_states, + .num_states = ARRAY_SIZE(nm_chan_fsm_states), + .event_names = nm_chan_fsm_event_names, + .log_subsys = DOML, +}; + +static __attribute__((constructor)) void nm_chan_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&nm_chan_fsm) == 0); +} diff --git a/src/common/oml.c b/src/common/oml.c index 19559b8..370cf2d 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -880,7 +880,7 @@ rc = oml_tlv_parse(&tp, foh->data, msgb_l3len(msg) - sizeof(*foh)); if (rc < 0) { - oml_tx_failure_event_rep(&ts->mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_UNSUP_ATTR, + oml_tx_failure_event_rep(&ts->nm_chan.mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_UNSUP_ATTR, "New value for Set Channel Attribute not supported"); return oml_fom_ack_nack(msg, NM_NACK_INCORR_STRUCT); } @@ -927,11 +927,11 @@ } /* merge existing BTS attributes with new attributes */ - tp_merged = osmo_tlvp_copy(ts->mo.nm_attr, bts); + tp_merged = osmo_tlvp_copy(ts->nm_chan.mo.nm_attr, bts); osmo_tlvp_merge(tp_merged, &tp); /* Call into BTS driver to check attribute values */ - rc = bts_model_check_oml(bts, foh->msg_type, ts->mo.nm_attr, tp_merged, ts); + rc = bts_model_check_oml(bts, foh->msg_type, ts->nm_chan.mo.nm_attr, tp_merged, ts); if (rc < 0) { LOGPFOH(DOML, LOGL_ERROR, foh, "SET CHAN ATTR: invalid attribute value, rc=%d\n", rc); talloc_free(tp_merged); @@ -940,8 +940,8 @@ } /* Success: replace old BTS attributes with new */ - talloc_free(ts->mo.nm_attr); - ts->mo.nm_attr = tp_merged; + talloc_free(ts->nm_chan.mo.nm_attr); + ts->nm_chan.mo.nm_attr = tp_merged; /* 9.4.13 Channel Combination */ if (TLVP_PRES_LEN(&tp, NM_ATT_CHAN_COMB, 1)) { @@ -1551,7 +1551,7 @@ trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); if (obj_inst->ts_nr >= TRX_NR_TS) return NULL; - mo = &trx->ts[obj_inst->ts_nr].mo; + mo = &trx->ts[obj_inst->ts_nr].nm_chan.mo; break; case NM_OC_SITE_MANAGER: mo = &bts->site_mgr.mo; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 45047ba..0ecc526 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -211,7 +211,7 @@ for (tn = 0; tn < 8; tn++) { const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; - if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED) + if (ts->nm_chan.mo.nm_state.operational != NM_OPSTATE_ENABLED) continue; if (!ts_should_be_pdch(ts)) continue; @@ -907,7 +907,7 @@ break; for (j = 0; j < 8; j++) { ts = &trx->ts[j]; - if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED + if (ts->nm_chan.mo.nm_state.operational == NM_OPSTATE_ENABLED && ts->pchan == GSM_PCHAN_PDCH) { ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU; l1sap_chan_rel(trx, diff --git a/src/common/vty.c b/src/common/vty.c index b442f83..b7132a9 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1045,7 +1045,7 @@ ts->flags & TS_F_PDCH_ACTIVE ? "PDCH" : "TCH/F"); vty_out(vty, "%s", VTY_NEWLINE); vty_out(vty, " NM State: "); - net_dump_nmstate(vty, &ts->mo.nm_state); + net_dump_nmstate(vty, &ts->nm_chan.mo.nm_state); } DEFUN(show_ts, diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c index a01df68..e10f818 100644 --- a/src/osmo-bts-litecell15/oml.c +++ b/src/osmo-bts-litecell15/oml.c @@ -45,6 +45,7 @@ #include #include #include +#include #include "l1_if.h" #include "lc15bts.h" @@ -278,38 +279,41 @@ get_value_string(lc15bts_l1prim_names, l1p->id), get_value_string(lc15bts_l1status_names, status)); msgb_free(l1_msg); - if (mo->obj_class == NM_OC_RADIO_CARRIER) + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_NACK, (void*)(intptr_t)NM_NACK_CANT_PERFORM); - else - return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); - } - - msgb_free(l1_msg); - - /* We already have a FSM for Radio Carrier, handle it there */ - if (mo->obj_class == NM_OC_RADIO_CARRIER) - return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); - - /* Set to Operational State: Enabled */ - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); - - /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ - if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 && - mo->obj_inst.ts_nr == 0) { - struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); - DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n"); - mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = - LCHAN_REL_ACT_OML; - lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); - if (cbch) { - cbch->rel_act_kind = LCHAN_REL_ACT_OML; - lchan_activate(cbch); + case NM_OC_CHANNEL: + return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].nm_chan.fi, NM_CHAN_EV_OPSTART_NACK, + (void*)(intptr_t)NM_NACK_CANT_PERFORM); + default: + OSMO_ASSERT(0); } } - /* Send OPSTART ack */ - return oml_mo_opstart_ack(mo); + msgb_free(l1_msg); + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: + return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + case NM_OC_CHANNEL: + /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ + if (mo->obj_inst.trx_nr == 0 && + mo->obj_inst.ts_nr == 0) { + struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); + DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n"); + mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = + LCHAN_REL_ACT_OML; + lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); + if (cbch) { + cbch->rel_act_kind = LCHAN_REL_ACT_OML; + lchan_activate(cbch); + } + } + return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].nm_chan.fi, + NM_CHAN_EV_OPSTART_ACK, NULL); + default: + OSMO_ASSERT(0); + } } static int opstart_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg, @@ -319,7 +323,7 @@ GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_MphConnectCnf_t *cnf = &l1p->u.mphConnectCnf; - mo = &trx->ts[cnf->u8Tn].mo; + mo = &trx->ts[cnf->u8Tn].nm_chan.mo; return opstart_compl(mo, l1_msg); } @@ -1886,6 +1890,7 @@ void *obj) { struct gsm_bts_trx *trx; + struct gsm_bts_trx_ts *ts; int rc; switch (mo->obj_class) { @@ -1898,7 +1903,8 @@ rc = osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_OPSTART_ACK, NULL); break; case NM_OC_CHANNEL: - rc = ts_opstart(obj); + ts = (struct gsm_bts_trx_ts*) obj; + rc = ts_opstart(ts); break; case NM_OC_BTS: case NM_OC_SITE_MANAGER: diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index 2f2730e..0464225 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -278,38 +278,41 @@ get_value_string(oc2gbts_l1prim_names, l1p->id), get_value_string(oc2gbts_l1status_names, status)); msgb_free(l1_msg); - if (mo->obj_class == NM_OC_RADIO_CARRIER) + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_NACK, (void*)(intptr_t)NM_NACK_CANT_PERFORM); - else - return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); - } - - msgb_free(l1_msg); - - /* We already have a FSM for Radio Carrier, handle it there */ - if (mo->obj_class == NM_OC_RADIO_CARRIER) - return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); - - /* Set to Operational State: Enabled */ - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); - - /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ - if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 && - mo->obj_inst.ts_nr == 0) { - struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); - DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n"); - mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = - LCHAN_REL_ACT_OML; - lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); - if (cbch) { - cbch->rel_act_kind = LCHAN_REL_ACT_OML; - lchan_activate(cbch); + case NM_OC_CHANNEL: + return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].nm_chan.fi, NM_CHAN_EV_OPSTART_NACK, + (void*)(intptr_t)NM_NACK_CANT_PERFORM); + default: + OSMO_ASSERT(0); } } - /* Send OPSTART ack */ - return oml_mo_opstart_ack(mo); + msgb_free(l1_msg); + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: + return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + case NM_OC_CHANNEL: + /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ + if (mo->obj_inst.trx_nr == 0 && + mo->obj_inst.ts_nr == 0) { + struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); + DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n"); + mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = + LCHAN_REL_ACT_OML; + lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); + if (cbch) { + cbch->rel_act_kind = LCHAN_REL_ACT_OML; + lchan_activate(cbch); + } + } + return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].nm_chan.fi, + NM_CHAN_EV_OPSTART_ACK, NULL); + default: + OSMO_ASSERT(0); + } } static int opstart_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg, @@ -1894,6 +1897,7 @@ void *obj) { struct gsm_bts_trx* trx; + struct gsm_bts_trx_ts *ts; int rc; switch (mo->obj_class) { @@ -1906,6 +1910,7 @@ rc = osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_OPSTART_ACK, NULL); break; case NM_OC_CHANNEL: + ts = (struct gsm_bts_trx_ts*) obj; rc = ts_opstart(obj); break; case NM_OC_BTS: diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 37a3e65..15353d0 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -311,15 +311,10 @@ /* For OctPHY, this only about sending state changes to BSC */ int l1if_activate_rf(struct gsm_bts_trx *trx, int on) { - int i; if (on) { /* signal availability */ osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_SW_ACT, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_SW_ACT, NULL); - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) - oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, - NM_AVSTATE_DEPENDENCY); } else { osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_DISABLE, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_DISABLE, NULL); diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 50116b5..f1d873d 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "l1_if.h" #include "l1_oml.h" @@ -191,28 +192,28 @@ /* TODO: Send NACK in case of error! */ struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr); - /* We already have a FSM for Radio Carrier, handle it there */ - if (mo->obj_class == NM_OC_RADIO_CARRIER) + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); - - /* Set to Operational State: Enabled */ - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); - - /* hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ - if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 && - mo->obj_inst.ts_nr == 7) { - struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); - mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = - LCHAN_REL_ACT_OML; - lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); - if (cbch) { - cbch->rel_act_kind = LCHAN_REL_ACT_OML; - lchan_activate(cbch); + case NM_OC_CHANNEL: + /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ + if (mo->obj_inst.trx_nr == 0 && + mo->obj_inst.ts_nr == 0) { + struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); + DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n"); + mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = + LCHAN_REL_ACT_OML; + lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); + if (cbch) { + cbch->rel_act_kind = LCHAN_REL_ACT_OML; + lchan_activate(cbch); + } } + return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].nm_chan.fi, + NM_CHAN_EV_OPSTART_ACK, NULL); + default: + OSMO_ASSERT(0); } - - /* Send OPSTART ack */ - return oml_mo_opstart_ack(mo); } static @@ -1502,7 +1503,7 @@ } trx = ts->trx; - mo = &trx->ts[ar->PchId.byTimeslotNb].mo; + mo = &trx->ts[ar->PchId.byTimeslotNb].nm_chan.mo; msgb_free(resp); diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 11b71bd..f55b881 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -37,6 +37,7 @@ #include #include #include +#include /* TODO: check if dummy method is sufficient, else implement */ int bts_model_lchan_deactivate(struct gsm_lchan *lchan) @@ -77,13 +78,8 @@ static uint8_t vbts_set_bts(struct gsm_bts *bts) { struct gsm_bts_trx *trx; - uint8_t tn; llist_for_each_entry(trx, &bts->trx_list, list) { - - for (tn = 0; tn < TRX_NR_TS; tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); - /* report availability of trx to the bts. this will trigger the rsl connection */ osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_SW_ACT, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_SW_ACT, NULL); @@ -127,6 +123,7 @@ { int rc; struct gsm_bts_trx* trx; + struct gsm_bts_trx_ts* ts; switch (mo->obj_class) { case NM_OC_RADIO_CARRIER: @@ -138,6 +135,9 @@ rc = osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_OPSTART_ACK, NULL); break; case NM_OC_CHANNEL: + ts = (struct gsm_bts_trx_ts *) obj; + rc = osmo_fsm_inst_dispatch(ts->nm_chan.fi, NM_CHAN_EV_OPSTART_ACK, NULL); + break; case NM_OC_SITE_MANAGER: case NM_OC_BTS: case NM_OC_GPRS_NSE: diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index e766cea..99b17e8 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1219,7 +1219,6 @@ SuperFemto_Prim_t *sysp = msgb_sysprim(resp); GsmL1_Status_t status; int on = 0; - unsigned int i; if (sysp->id == SuperFemto_PrimId_ActivateRfCnf) on = 1; @@ -1244,9 +1243,6 @@ /* signal availability */ osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_SW_ACT, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_SW_ACT, NULL); - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) - oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); } else { bts_update_status(BTS_STATUS_RF_ACTIVE, 0); osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_DISABLE, NULL); diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index e14bea3..0a5fd0a 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include "l1_if.h" #include "femtobts.h" @@ -277,38 +279,41 @@ get_value_string(femtobts_l1prim_names, l1p->id), get_value_string(femtobts_l1status_names, status)); msgb_free(l1_msg); - if (mo->obj_class == NM_OC_RADIO_CARRIER) + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_NACK, (void*)(intptr_t)NM_NACK_CANT_PERFORM); - else - return oml_mo_opstart_nack(mo, NM_NACK_CANT_PERFORM); - } - - msgb_free(l1_msg); - - /* We already have a FSM for Radio Carrier, handle it there */ - if (mo->obj_class == NM_OC_RADIO_CARRIER) - return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); - - /* Set to Operational State: Enabled */ - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); - - /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ - if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 && - mo->obj_inst.ts_nr == 0) { - struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); - DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n"); - mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = - LCHAN_REL_ACT_OML; - lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); - if (cbch) { - cbch->rel_act_kind = LCHAN_REL_ACT_OML; - lchan_activate(cbch); + case NM_OC_CHANNEL: + return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].nm_chan.fi, NM_CHAN_EV_OPSTART_NACK, + (void*)(intptr_t)NM_NACK_CANT_PERFORM); + default: + OSMO_ASSERT(0); } } - /* Send OPSTART ack */ - return oml_mo_opstart_ack(mo); + msgb_free(l1_msg); + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: + return osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_OPSTART_ACK, NULL); + case NM_OC_CHANNEL: + /* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */ + if (mo->obj_inst.trx_nr == 0 && + mo->obj_inst.ts_nr == 0) { + struct gsm_lchan *cbch = gsm_bts_get_cbch(mo->bts); + DEBUGP(DL1C, "====> trying to activate lchans of BCCH\n"); + mo->bts->c0->ts[0].lchan[CCCH_LCHAN].rel_act_kind = + LCHAN_REL_ACT_OML; + lchan_activate(&mo->bts->c0->ts[0].lchan[CCCH_LCHAN]); + if (cbch) { + cbch->rel_act_kind = LCHAN_REL_ACT_OML; + lchan_activate(cbch); + } + } + return osmo_fsm_inst_dispatch(trx->ts[mo->obj_inst.ts_nr].nm_chan.fi, + NM_CHAN_EV_OPSTART_ACK, NULL); + default: + OSMO_ASSERT(0); + } } static int opstart_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg, @@ -318,7 +323,7 @@ GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_MphConnectCnf_t *cnf = &l1p->u.mphConnectCnf; - mo = &trx->ts[cnf->u8Tn].mo; + mo = &trx->ts[cnf->u8Tn].nm_chan.mo; return opstart_compl(mo, l1_msg); } @@ -1772,6 +1777,7 @@ void *obj) { struct gsm_bts_trx* trx; + struct gsm_bts_trx_ts *ts; int rc; switch (mo->obj_class) { @@ -1784,7 +1790,8 @@ rc = osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_OPSTART_ACK, NULL); break; case NM_OC_CHANNEL: - rc = ts_opstart(obj); + ts = (struct gsm_bts_trx_ts*) obj; + rc = ts_opstart(ts); break; case NM_OC_BTS: case NM_OC_SITE_MANAGER: diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 9797188..72aa74e 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -46,6 +46,7 @@ #include #include #include +#include #include "l1_if.h" #include "trx_if.h" @@ -92,7 +93,6 @@ { struct phy_instance *pinst = l1h->phy_inst; struct gsm_bts_trx *trx = pinst->trx; - uint8_t tn; /* HACK, we should change state when we receive first clock from * transceiver */ @@ -103,19 +103,9 @@ osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_SW_ACT, NULL); pinst->u.osmotrx.sw_act_reported = true; } - - for (tn = 0; tn < TRX_NR_TS; tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, - (l1h->config.slotmask & (1 << tn)) ? - NM_AVSTATE_DEPENDENCY : - NM_AVSTATE_NOT_INSTALLED); } else { osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_DISABLE, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_DISABLE, NULL); - - for (tn = 0; tn < TRX_NR_TS; tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, - NM_AVSTATE_OFF_LINE); } } @@ -604,6 +594,7 @@ void *obj) { struct gsm_bts_trx *trx; + struct gsm_bts_trx_ts *ts; int rc; switch (mo->obj_class) { @@ -617,6 +608,9 @@ rc = osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_OPSTART_ACK, NULL); break; case NM_OC_CHANNEL: + ts = (struct gsm_bts_trx_ts *) obj; + rc = osmo_fsm_inst_dispatch(ts->nm_chan.fi, NM_CHAN_EV_OPSTART_ACK, NULL); + break; case NM_OC_BTS: case NM_OC_SITE_MANAGER: case NM_OC_GPRS_NSE: diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 218697b..b89013b 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "virtual_um.h" @@ -84,13 +85,8 @@ static uint8_t vbts_set_bts(struct gsm_bts *bts) { struct gsm_bts_trx *trx; - uint8_t tn; llist_for_each_entry(trx, &bts->trx_list, list) { - - for (tn = 0; tn < TRX_NR_TS; tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); - /* report availability of trx to the bts. this will trigger the rsl connection */ osmo_fsm_inst_dispatch(trx->rc.fi, NM_RCARRIER_EV_SW_ACT, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_SW_ACT, NULL); @@ -141,6 +137,7 @@ { int rc; struct gsm_bts_trx* trx; + struct gsm_bts_trx_ts *ts; switch (mo->obj_class) { case NM_OC_RADIO_CARRIER: @@ -152,6 +149,9 @@ rc = osmo_fsm_inst_dispatch(trx->bb_transc.fi, NM_BBTRANSC_EV_OPSTART_ACK, NULL); break; case NM_OC_CHANNEL: + ts = (struct gsm_bts_trx_ts *) obj; + rc = osmo_fsm_inst_dispatch(ts->nm_chan.fi, NM_CHAN_EV_OPSTART_ACK, NULL); + break; case NM_OC_SITE_MANAGER: case NM_OC_BTS: case NM_OC_GPRS_NSE: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I288cbfb4730b25a334ef1c3d6b9679d6f1d4cfc5 Gerrit-Change-Number: 20311 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 13:47:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 28 Sep 2020 13:47:35 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... Patch Set 1: > Patch Set 1: > > I think it would make sense to add an CMD_ATTR_RESTART as well. The question is whether we really need this attribute. Basically all commands apply on full program restart, so I don't think we need to add this one to every command. Instead, we can state in the VTY chapter that "a configuration parameter applies on restart of the process unless stated otherwise". What do you think? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 13:47:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 13:55:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 Sep 2020 13:55:40 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... Patch Set 1: -Code-Review > Patch Set 1: > > > Patch Set 1: > > > > I think it would make sense to add an CMD_ATTR_RESTART as well. > > The question is whether we really need this attribute. Basically all commands apply on full program restart, so I don't think we need to add this one to every command. Instead, we can state in the VTY chapter that "a configuration parameter applies on restart of the process unless stated otherwise". What do you think? I do don't think that this is such a good idea. All interactive commands explicitly do not apply on restart. Isn't that a problem? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 13:55:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 14:10:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 28 Sep 2020 14:10:56 +0000 Subject: Change in docker-playground[master]: PCU+SGSN: Adjust to new "provider" structure of NSConfiguration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20191 ) Change subject: PCU+SGSN: Adjust to new "provider" structure of NSConfiguration ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8c5e59e79b69c13632d69f5011be9279b827a4fa Gerrit-Change-Number: 20191 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 28 Sep 2020 14:10:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 14:11:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 28 Sep 2020 14:11:07 +0000 Subject: Change in docker-playground[master]: PCU+SGSN: Adjust to new "provider" structure of NSConfiguration In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20191 ) Change subject: PCU+SGSN: Adjust to new "provider" structure of NSConfiguration ...................................................................... PCU+SGSN: Adjust to new "provider" structure of NSConfiguration In Change-Id I6904520d8c2f546327029777d68b1907611a8cf5 of osmo-ttcn3-hacks, we change the structure of NSConfiguration. Let's adjust the configs accordingly. Change-Id: I8c5e59e79b69c13632d69f5011be9279b827a4fa Depends: osmo-ttcn3-hacks I6904520d8c2f546327029777d68b1907611a8cf5 --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/sns/PCU_Tests.cfg M ttcn3-sgsn-test/SGSN_Tests.cfg 3 files changed, 39 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 89c997e..b5331f1 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -15,11 +15,15 @@ PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts" PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10" SGSN_Components.mp_nsconfig := { - address_family := AF_INET, - local_ip := "172.18.13.10", - local_udp_port := 23000, - remote_ip := "172.18.13.101", - remote_udp_port := 23000, + provider := { + ip := { + address_family := AF_INET, + local_ip := "172.18.13.10", + local_udp_port := 23000, + remote_ip := "172.18.13.101", + remote_udp_port := 23000 + } + }, nsvci := 1234, nsei := 1234 } diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index f441d18..45b3fc7 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -9,11 +9,15 @@ [MODULE_PARAMETERS] PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts" SGSN_Components.mp_nsconfig := { - address_family := AF_INET, - local_ip := "172.18.14.10", - local_udp_port := 23000, - remote_ip := "172.18.14.101", - remote_udp_port := 23000, + provider := { + ip := { + address_family := AF_INET, + local_ip := "172.18.14.10", + local_udp_port := 23000, + remote_ip := "172.18.14.101", + remote_udp_port := 23000 + } + }, nsvci := 1234, nsei := 1234 } diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index 055ae5a..612fe03 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -14,19 +14,31 @@ [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { { - address_family := AF_INET, - local_ip := "172.18.8.103", - remote_ip := "172.18.8.10" + provider := { + ip := { + address_family := AF_INET, + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + } + } }, { - address_family := AF_INET, - local_ip := "172.18.8.103", - remote_ip := "172.18.8.10" + provider := { + ip := { + address_family := AF_INET, + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + } + } }, { - address_family := AF_INET, - local_ip := "172.18.8.103", - remote_ip := "172.18.8.10" + provider := { + ip := { + address_family := AF_INET, + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + } + } } } SGSN_Tests.mp_ranap_cfg := { -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8c5e59e79b69c13632d69f5011be9279b827a4fa Gerrit-Change-Number: 20191 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 14:23:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 14:23:58 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 to look at the new patch set (#7). Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Introduce NM operative state Radio Carrier FSM All the Operative State logic to manage a RadioCarrier NM object is centralized in this FSM, where other parts of the code simply send events to it. This allows keeping state consistent and offloading logic from each bts backend, since they are only required to submit events now. The idea in the long run is to also replace other NM objects with similar FSMs. This improved logic fixes bug where PHY + RSL link became available before OPSTART and hence op state changed to Enabled before receiving any OPSTART message. Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts_trx.h A include/osmo-bts/nm_bb_transc_fsm.h A include/osmo-bts/nm_radio_carrier_fsm.h M src/common/Makefile.am M src/common/bts.c M src/common/bts_shutdown_fsm.c M src/common/bts_trx.c M src/common/l1sap.c A src/common/nm_bb_transc_fsm.c A src/common/nm_radio_carrier_fsm.c M src/common/oml.c M src/common/pcu_sock.c M src/common/phy_link.c M src/common/rsl.c M src/common/vty.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/calib_file.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-virtual/bts_model.c 29 files changed, 767 insertions(+), 145 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/20284/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 15:35:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 28 Sep 2020 15:35:04 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20284 ) Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Patch Set 7: Don't merge these yet, I still need to do some tests again nanobts with osmo-bsc (I also have some patches there WIP). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 15:35:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 20:02:28 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 Sep 2020 20:02:28 +0000 Subject: Change in libosmocore[master]: vty/command: reflect global attributes in the XML reference In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19577 ) Change subject: vty/command: reflect global attributes in the XML reference ...................................................................... Patch Set 2: Verified+1 Code-Review+2 I have tried this now - looks good to me. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b Gerrit-Change-Number: 19577 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 20:02:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 20:03:08 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 Sep 2020 20:03:08 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 28 Sep 2020 20:03:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Sep 28 20:06:37 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 Sep 2020 20:06:37 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20250 ) Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 28 Sep 2020 20:06:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 29 01:38:01 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 29 Sep 2020 01:38:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f7290125795c_16f02ae8b82726002411b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 156s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 156s] [COMPILING libboard/qmod/source/card_pres.c] [ 156s] [COMPILING libboard/qmod/source/wwan_led.c] [ 156s] [COMPILING libboard/qmod/source/i2c.c] [ 156s] [COMPILING libboard/qmod/source/board_qmod.c] [ 156s] [COMPILING apps/dfu/main.c] [ 157s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 157s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 157s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 157s] Memory region Used Size Region Size %age Used [ 157s] rom: 16588 B 16 KB 101.25% [ 157s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 157s] collect2: error: ld returned 1 exit status [ 157s] % [ 157s] make[2]: *** [Makefile:234: flash] Error 1 [ 157s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 157s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 157s] dh_auto_build: error: make -j1 returned exit code 2 [ 157s] make: *** [debian/rules:16: build] Error 25 [ 157s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 157s] ### VM INTERACTION START ### [ 160s] [ 149.773147] sysrq: Power Off [ 160s] [ 149.778145] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] lamb09 failed "build simtrace2_0.7.0.63.39070.dsc" at Tue Sep 29 01:37:45 UTC 2020. [ 160s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Sep 29 06:11:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 29 Sep 2020 06:11:53 +0000 Subject: Change in libosmocore[master]: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20309 ) Change subject: vty/command: introduce new attribute CMD_ATTR_IMMEDIATE ...................................................................... vty/command: introduce new attribute CMD_ATTR_IMMEDIATE This attribute indicates that a VTY command applies immediately. Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Related: SYS#4937 --- M include/osmocom/vty/command.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 47d2e5f..43ad3da 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -137,6 +137,7 @@ enum { CMD_ATTR_DEPRECATED = (1 << 0), CMD_ATTR_HIDDEN = (1 << 1), + CMD_ATTR_IMMEDIATE = (1 << 2), }; /*! Structure of a command element */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia185dfd0c89214dc893af70736ff01dca3a7627e Gerrit-Change-Number: 20309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 06:11:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 29 Sep 2020 06:11:55 +0000 Subject: Change in libosmocore[master]: vty/command: reflect global attributes in the XML reference In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19577 ) Change subject: vty/command: reflect global attributes in the XML reference ...................................................................... vty/command: reflect global attributes in the XML reference Given that commands with either/both of the following attributes: - CMD_ATTR_DEPRECATED, - CMD_ATTR_HIDDEN, never end up in the XML reference, only CMD_ATTR_IMMEDIATE would be reflected for commands taking effect immediately as follows: Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b Related: SYS#4937 --- M src/vty/command.c 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/src/vty/command.c b/src/vty/command.c index bad2688..30c39a7 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -622,6 +622,13 @@ typedef int (*print_func_t)(void *data, const char *fmt, ...); +static const struct value_string cmd_attr_desc[] = { + { CMD_ATTR_DEPRECATED, "This command is deprecated" }, + { CMD_ATTR_HIDDEN, "This command is hidden" }, + { CMD_ATTR_IMMEDIATE, "This command applies immediately" }, + { 0, NULL } +}; + /* * Write one cmd_element as XML via a print_func_t. */ @@ -632,6 +639,25 @@ print_func(data, " %s", xml_string, newline); + /* Print global attributes and their description */ + if (cmd->attr != 0x00) { /* ... if at least one flag is set */ + print_func(data, " %s", newline); + + for (i = 0; i < ARRAY_SIZE(cmd_attr_desc) - 1; i++) { + char *xml_att_desc; + + if (~cmd->attr & cmd_attr_desc[i].value) + continue; + + xml_att_desc = xml_escape(cmd_attr_desc[i].str); + print_func(data, " %s", + xml_att_desc, newline); + talloc_free(xml_att_desc); + } + + print_func(data, " %s", newline); + } + /* Print application specific attributes and their description */ if (cmd->usrattr != 0x00) { /* ... if at least one flag is set */ print_func(data, " %s", newline); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b Gerrit-Change-Number: 19577 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 10:52:08 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 29 Sep 2020 10:52:08 +0000 Subject: Change in pysim[master]: Move programminig of ePDG Id to generic USIM class References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20312 ) Change subject: Move programminig of ePDG Id to generic USIM class ...................................................................... Move programminig of ePDG Id to generic USIM class Change-Id: I198d2d3303343b24ec92ba73cce21257213f6f89 --- M pySim/cards.py 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/20312/1 diff --git a/pySim/cards.py b/pySim/cards.py index 8835cc9..f2a3d2a 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -264,6 +264,11 @@ data, sw = self._scc.update_binary(EF_USIM_ADF_map['EHPLMN'], ehplmn) return sw + def update_epdgid(self, epdgid): + epdgid_tlv = enc_epdgid(epdgid) + data, sw = self._scc.update_binary( + EF_USIM_ADF_map['ePDGId'], epdgid_tlv) + return sw class _MagicSimBase(Card): @@ -1164,8 +1169,7 @@ # update EF.ePDGId in ADF.USIM if self.file_exists(EF_USIM_ADF_map['ePDGId']): if p.get('epdgid'): - sw = self._scc.update_binary( - EF_USIM_ADF_map['ePDGId'], enc_epdgid(p['epdgid'])) + sw = self.update_epdgid(p['epdgid']) if sw != '9000': print("Programming ePDGId failed with code %s"%sw) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I198d2d3303343b24ec92ba73cce21257213f6f89 Gerrit-Change-Number: 20312 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 10:52:09 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 29 Sep 2020 10:52:09 +0000 Subject: Change in pysim[master]: Surround by try except to continue programming of other parameters References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20313 ) Change subject: Surround by try except to continue programming of other parameters ...................................................................... Surround by try except to continue programming of other parameters Currently, if programming of a certain EF fails the program execution stops at that point and prevents programming of subsequent parametes in the program flow. Therefore, surrounding by try catch ensures programming of all non-failing EFs and displays error messages for the failing EFs. Change-Id: I5a200e0594dc29cb6fdaf8966f4a11adeddcd80f --- M pySim/cards.py 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/13/20313/1 diff --git a/pySim/cards.py b/pySim/cards.py index f2a3d2a..d596e22 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1162,16 +1162,22 @@ # update EF.EHPLMN in ADF.USIM if self.file_exists(EF_USIM_ADF_map['EHPLMN']): if p.get('mcc') and p.get('mnc'): - sw = self.update_ehplmn(p['mcc'], p['mnc']) - if sw != '9000': - print("Programming EHPLMN failed with code %s"%sw) + try: + sw = self.update_ehplmn(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming EHPLMN failed with code %s"%sw) + except Exception as e: + print("EHPLMN: Can't update file -- " + str(e)) # update EF.ePDGId in ADF.USIM if self.file_exists(EF_USIM_ADF_map['ePDGId']): if p.get('epdgid'): - sw = self.update_epdgid(p['epdgid']) - if sw != '9000': - print("Programming ePDGId failed with code %s"%sw) + try: + sw = self.update_epdgid(p['epdgid']) + if sw != '9000': + print("Programming ePDGId failed with code %s"%sw) + except Exception as e: + print("ePDGId: Can't update file -- " + str(e)) return -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5a200e0594dc29cb6fdaf8966f4a11adeddcd80f Gerrit-Change-Number: 20313 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 10:52:09 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 29 Sep 2020 10:52:09 +0000 Subject: Change in pysim[master]: Move reading of ePDG Id to generic USIM class References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20314 ) Change subject: Move reading of ePDG Id to generic USIM class ...................................................................... Move reading of ePDG Id to generic USIM class Change-Id: I716acb994430db3d4e56fea072f8dc2cebeaba84 --- M pySim-read.py M pySim/cards.py 2 files changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/14/20314/1 diff --git a/pySim-read.py b/pySim-read.py index 2ca0557..a4f15f8 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -267,12 +267,12 @@ #EF.ePDGId - Home ePDG Identifier try: - (res, sw) = card.read_binary(EF_USIM_ADF_map['ePDGId']) - if sw == '9000': - content = dec_epdgid(res) - print("ePDGId:\n%s" % (len(content) and content or '\tNot available\n',)) - else: - print("ePDGId: Can't read, response code = %s" % (sw,)) + if card.file_exists(EF_USIM_ADF_map['ePDGId']): + (res, sw) = card.read_epdgid() + if sw == '9000': + print("ePDGId:\n%s" % (len(res) and res or '\tNot available\n',)) + else: + print("ePDGId: Can't read, response code = %s" % (sw,)) except Exception as e: print("ePDGId: Can't read file -- " + str(e)) diff --git a/pySim/cards.py b/pySim/cards.py index d596e22..c4bf812 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -264,6 +264,13 @@ data, sw = self._scc.update_binary(EF_USIM_ADF_map['EHPLMN'], ehplmn) return sw + def read_epdgid(self): + (res, sw) = self._scc.read_binary(EF_USIM_ADF_map['ePDGId']) + if sw == '9000': + return (dec_epdgid(res), sw) + else: + return (None, sw) + def update_epdgid(self, epdgid): epdgid_tlv = enc_epdgid(epdgid) data, sw = self._scc.update_binary( -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I716acb994430db3d4e56fea072f8dc2cebeaba84 Gerrit-Change-Number: 20314 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 10:52:09 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 29 Sep 2020 10:52:09 +0000 Subject: Change in pysim[master]: Move reading of USIM service table to generic USIM class References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/20315 ) Change subject: Move reading of USIM service table to generic USIM class ...................................................................... Move reading of USIM service table to generic USIM class Change-Id: I537547f3bd01a547310358f8a8fceddcb4c79f37 --- M pySim-read.py M pySim/cards.py 2 files changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/20315/1 diff --git a/pySim-read.py b/pySim-read.py index a4f15f8..3e19a02 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -256,14 +256,20 @@ print("EHPLMN:\n%s" % (res)) else: print("EHPLMN: Can't read, response code = %s" % (sw,)) + # EF.UST - (res, sw) = card.read_binary(EF_USIM_ADF_map['UST']) - if sw == '9000': - print("USIM Service Table: %s" % res) - # Print those which are available - print("%s" % dec_st(res, table="usim")) - else: - print("USIM Service Table: Can't read, response code = %s" % (sw,)) + try: + if card.file_exists(EF_USIM_ADF_map['UST']): + # res[0] - EF content of UST + # res[1] - Human readable format of services marked available in UST + (res, sw) = card.read_ust() + if sw == '9000': + print("USIM Service Table: %s" % res[0]) + print("%s" % res[1]) + else: + print("USIM Service Table: Can't read, response code = %s" % (sw,)) + except Exception as e: + print("USIM Service Table: Can't read file -- " + str(e)) #EF.ePDGId - Home ePDG Identifier try: diff --git a/pySim/cards.py b/pySim/cards.py index c4bf812..ae4aaf2 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -277,6 +277,14 @@ EF_USIM_ADF_map['ePDGId'], epdgid_tlv) return sw + def read_ust(self): + (res, sw) = self._scc.read_binary(EF_USIM_ADF_map['UST']) + if sw == '9000': + # Print those which are available + return ([res, dec_st(res, table="usim")], sw) + else: + return ([None, None], sw) + class _MagicSimBase(Card): """ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I537547f3bd01a547310358f8a8fceddcb4c79f37 Gerrit-Change-Number: 20315 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 11:00:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 29 Sep 2020 11:00:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: allow to use IPV4 as default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 ) Change subject: MSC_ConnectionHandler: allow to use IPV4 as default ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c Gerrit-Change-Number: 20232 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 29 Sep 2020 11:00:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 11:01:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 29 Sep 2020 11:01:33 +0000 Subject: Change in osmo-bsc[master]: vty: fix unreacheable code / wrong check in lchan_act_all_trx() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20308 ) Change subject: vty: fix unreacheable code / wrong check in lchan_act_all_trx() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If7d8a108a147980d26b71836343d20b1b0b95579 Gerrit-Change-Number: 20308 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 29 Sep 2020 11:01:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 11:02:24 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 29 Sep 2020 11:02:24 +0000 Subject: Change in pysim[master]: Move reading of ePDG Id to generic USIM class In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/20314 to look at the new patch set (#2). Change subject: Move reading of ePDG Id to generic USIM class ...................................................................... Move reading of ePDG Id to generic USIM class Change-Id: I716acb994430db3d4e56fea072f8dc2cebeaba84 --- M pySim-read.py M pySim/cards.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/14/20314/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I716acb994430db3d4e56fea072f8dc2cebeaba84 Gerrit-Change-Number: 20314 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 11:09:13 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 29 Sep 2020 11:09:13 +0000 Subject: Change in pysim[master]: Move reading of USIM service table to generic USIM class In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/20315 to look at the new patch set (#3). Change subject: Move reading of USIM service table to generic USIM class ...................................................................... Move reading of USIM service table to generic USIM class Change-Id: I537547f3bd01a547310358f8a8fceddcb4c79f37 --- M pySim-read.py M pySim/cards.py 2 files changed, 23 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/20315/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I537547f3bd01a547310358f8a8fceddcb4c79f37 Gerrit-Change-Number: 20315 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 11:09:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 29 Sep 2020 11:09:21 +0000 Subject: Change in osmo-bsc[master]: vty: fix unreacheable code / wrong check in lchan_act_all_trx() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20308 ) Change subject: vty: fix unreacheable code / wrong check in lchan_act_all_trx() ...................................................................... vty: fix unreacheable code / wrong check in lchan_act_all_trx() Change-Id: If7d8a108a147980d26b71836343d20b1b0b95579 Fixes: CID#214277 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 003939b..8808c20 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5265,7 +5265,7 @@ } trx = gsm_bts_trx_num(bts, trx_nr); - if (!bts) { + if (!trx) { vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If7d8a108a147980d26b71836343d20b1b0b95579 Gerrit-Change-Number: 20308 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 11:30:17 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 29 Sep 2020 11:30:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: allow to use IPV4 as default In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 ) Change subject: MSC_ConnectionHandler: allow to use IPV4 as default ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c Gerrit-Change-Number: 20232 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 29 Sep 2020 11:30:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 11:30:24 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 29 Sep 2020 11:30:24 +0000 Subject: Change in docker-playground[master]: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20275 ) Change subject: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Gerrit-Change-Number: 20275 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 29 Sep 2020 11:30:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Sep 29 14:22:21 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 29 Sep 2020 14:22:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5f73432ee37ac_4a7b2b168713c5e0185868@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was armbuild18:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Sep 29 16:22:43 2020 From: gerrit-no-reply at lists.osmocom.org (roh) Date: Tue, 29 Sep 2020 16:22:43 +0000 Subject: Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: roh has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 29 Sep 2020 16:22:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 16:24:47 2020 From: gerrit-no-reply at lists.osmocom.org (roh) Date: Tue, 29 Sep 2020 16:24:47 +0000 Subject: Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: roh has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20289/1/include/osmocom/gsm/protocol/gsm_12_21.h File include/osmocom/gsm/protocol/gsm_12_21.h: https://gerrit.osmocom.org/c/libosmocore/+/20289/1/include/osmocom/gsm/protocol/gsm_12_21.h at 794 PS1, Line 794: 0x00 sure this should be 0x00 and not 0xff to make this compatible with the ip protocol/next header fields? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 29 Sep 2020 16:24:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 16:30:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 16:30:57 +0000 Subject: Change in libosmocore[master]: write_queue: Add osmo_wqueue_enqueue_quiet() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20295 ) Change subject: write_queue: Add osmo_wqueue_enqueue_quiet() ...................................................................... write_queue: Add osmo_wqueue_enqueue_quiet() Same as osmo_wqueue_enqueue() but without logging queue overruns. Change-Id: Ic082eb39795b08631284eeb421fef3c28f2e90dc --- M include/osmocom/core/write_queue.h M src/write_queue.c 2 files changed, 19 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 071621d..75d5d8f 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -53,6 +53,7 @@ void osmo_wqueue_init(struct osmo_wqueue *queue, int max_length); void osmo_wqueue_clear(struct osmo_wqueue *queue); int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data); +int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what); /*! @} */ diff --git a/src/write_queue.c b/src/write_queue.c index 3399b0f..c7dedc4 100644 --- a/src/write_queue.c +++ b/src/write_queue.c @@ -100,6 +100,23 @@ INIT_LLIST_HEAD(&queue->msg_queue); } +/*! Enqueue a new \ref msgb into a write queue (without logging full queue events) + * \param[in] queue Write queue to be used + * \param[in] data to-be-enqueued message buffer + * \returns 0 on success; negative on error + */ +int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data) +{ + if (queue->current_length >= queue->max_length) + return -ENOSPC; + + ++queue->current_length; + msgb_enqueue(&queue->msg_queue, data); + queue->bfd.when |= OSMO_FD_WRITE; + + return 0; +} + /*! Enqueue a new \ref msgb into a write queue * \param[in] queue Write queue to be used * \param[in] data to-be-enqueued message buffer @@ -113,11 +130,7 @@ return -ENOSPC; } - ++queue->current_length; - msgb_enqueue(&queue->msg_queue, data); - queue->bfd.when |= OSMO_FD_WRITE; - - return 0; + return osmo_wqueue_enqueue_quiet(queue, data); } /*! Clear a \ref osmo_wqueue -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic082eb39795b08631284eeb421fef3c28f2e90dc Gerrit-Change-Number: 20295 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 16:30:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 16:30:58 +0000 Subject: Change in libosmocore[master]: write_queue: use msgb_{en, de}queue_count() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20301 ) Change subject: write_queue: use msgb_{en,de}queue_count() ...................................................................... write_queue: use msgb_{en,de}queue_count() The write_queue.c implemetation predates the msgb_*queue_count() functions for maintaining a count alongside witha msgb queue. Let's migrate over to those implementations. Change-Id: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7 --- M src/write_queue.c 1 file changed, 3 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/write_queue.c b/src/write_queue.c index c7dedc4..422eda4 100644 --- a/src/write_queue.c +++ b/src/write_queue.c @@ -64,11 +64,9 @@ fd->when &= ~OSMO_FD_WRITE; + msg = msgb_dequeue_count(&queue->msg_queue, &queue->current_length); /* the queue might have been emptied */ - if (!llist_empty(&queue->msg_queue)) { - --queue->current_length; - - msg = msgb_dequeue(&queue->msg_queue); + if (msg) { rc = queue->write_cb(fd, msg); msgb_free(msg); @@ -110,8 +108,7 @@ if (queue->current_length >= queue->max_length) return -ENOSPC; - ++queue->current_length; - msgb_enqueue(&queue->msg_queue, data); + msgb_enqueue_count(&queue->msg_queue, data, &queue->current_length); queue->bfd.when |= OSMO_FD_WRITE; return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ebd42a50f239dd7e9f663ce4c42824a5c1b3ce7 Gerrit-Change-Number: 20301 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 16:37:32 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 29 Sep 2020 16:37:32 +0000 Subject: Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20289/1/include/osmocom/gsm/protocol/gsm_12_21.h File include/osmocom/gsm/protocol/gsm_12_21.h: https://gerrit.osmocom.org/c/libosmocore/+/20289/1/include/osmocom/gsm/protocol/gsm_12_21.h at 794 PS1, Line 794: 0x00 > sure this should be 0x00 and not 0xff to make this compatible with the ip protocol/next header field [?] 0x00 is just undefined or when the memory is zeroed. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 29 Sep 2020 16:37:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: roh Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 16:58:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 16:58:11 +0000 Subject: Change in libosmocore[master]: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20302 ) Change subject: write_queue: Re-enqueue msgb if write_cb returns -EAGAIN ...................................................................... write_queue: Re-enqueue msgb if write_cb returns -EAGAIN By adding this functionality, the write_cb() handler can "un-dequeue" the msgb in case of some error. The msgb might have been modified meanwhile, e.g. due to a partial write already pulling some data off the head of the msgb. Change-Id: I97bb0d64ec991adf5dd0b3708e0c7cf029e03b5f --- M src/write_queue.c 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/write_queue.c b/src/write_queue.c index 422eda4..b208b25 100644 --- a/src/write_queue.c +++ b/src/write_queue.c @@ -68,10 +68,15 @@ /* the queue might have been emptied */ if (msg) { rc = queue->write_cb(fd, msg); - msgb_free(msg); - - if (rc == -EBADF) + if (rc == -EBADF) { + msgb_free(msg); goto err_badfd; + } else if (rc == -EAGAIN) { + /* re-enqueue the msgb to the head of the queue */ + llist_add(&msg->list, &queue->msg_queue); + queue->current_length++; + } else + msgb_free(msg); if (!llist_empty(&queue->msg_queue)) fd->when |= OSMO_FD_WRITE; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I97bb0d64ec991adf5dd0b3708e0c7cf029e03b5f Gerrit-Change-Number: 20302 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 16:58:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 16:58:22 +0000 Subject: Change in libosmocore[master]: logging_vty: set osmo_stderr_target to NULL on "no log stderr" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20297 ) Change subject: logging_vty: set osmo_stderr_target to NULL on "no log stderr" ...................................................................... logging_vty: set osmo_stderr_target to NULL on "no log stderr" We cannot keep a reference to the old log_target around if we just destroyed/deleted it. Change-Id: I98a801cf83347a4422534d020d5ed5e2d1eb5482 --- M src/vty/logging_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 0e1782a..bd513e3 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -797,6 +798,7 @@ } log_target_destroy(tgt); + osmo_stderr_target = NULL; RET_WITH_UNLOCK(CMD_SUCCESS); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I98a801cf83347a4422534d020d5ed5e2d1eb5482 Gerrit-Change-Number: 20297 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 17:00:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 17:00:08 +0000 Subject: Change in libosmocore[master]: logging: Introduce MAX_LOG_SIZE for the magic number 4096 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20304 ) Change subject: logging: Introduce MAX_LOG_SIZE for the magic number 4096 ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/20304/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20304/1/src/logging.c at 59 PS1, Line 59: /* maximum length of the log string of a single log event (typically line) */ simply add length .. "including the terminating NUL character"? https://gerrit.osmocom.org/c/libosmocore/+/20304/1/src/logging.c at 396 PS1, Line 396: MAX_LOG_SIZE > Ack yes, but I'm not changing that size. Should I just adjust the comment above the #define? OR are you saying the #define should be 4095 and there should be a +1 here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 Gerrit-Change-Number: 20304 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 29 Sep 2020 17:00:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 17:35:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 29 Sep 2020 17:35:18 +0000 Subject: Change in osmo-pcu[master]: NOT_FOR_MERGE: test the jenkins References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20316 ) Change subject: NOT_FOR_MERGE: test the jenkins ...................................................................... NOT_FOR_MERGE: test the jenkins Change-Id: I80902d92b51eb2ce2ccf05fc77735d86b131056b --- M src/pcu_l1_if.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/16/20316/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 883cb22..85535c5 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -1,7 +1,7 @@ /* pcu_l1_if.cpp * * Copyright (C) 2012 Andreas Eversberg - * + * 1 * 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 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80902d92b51eb2ce2ccf05fc77735d86b131056b Gerrit-Change-Number: 20316 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 17:59:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 17:59:28 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#7). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 214 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 17:59:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 17:59:28 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20305 to look at the new patch set (#3). Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... logging: Avoid memcpy from stack to msgb in _file_output() For file and stderr output, the existing code always generates the log string on a stack buffer, and then (in case of non-blocking write via write_queue) copies it over to a msgb. Let's optimize this by turning _file_output() into a raw_output callback which first allocates the msgb and then format-prints directly to that msgb instaed of stack + memcpy. This has the disadvantage that we don't know how long the buffer has to be in order to print the entire string to it. As a result we always have to allocate a 4k-sized buffer (plus msgb overhead). The write_queue length for log file output has been decreased from 1024 entries to 156 entries in order to stay within the same memory requirements for each log target memory pool (about 648 kBytes). Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 --- M src/logging.c 1 file changed, 43 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/20305/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 17:59:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 29 Sep 2020 17:59:30 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20317 ) Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... logging: Attempt a synchronous, non-blocking write first (file, stderr) In the old days, we performed synchronous, blocking writes to the log file or stderr. This was replaced by code that turned all log file/stderr writes into non-blocking writes behind a write_queue. This patch now introduces a further optimization: If we currently don't have any log messages pending in the write queue, we are not back-logged and assume we have a fair chance of writing the log message right now, synchronously. So we try that first, and only enqueue the log message if the write fails (no bytes or insufficient number of bytes written). This way we should get the best of both worlds: No delay/re-ordering (and lower select syscall load) for the "normal" case (benefits of the old synchronous writes) while at the same time never risking to block on log output. Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 --- M src/logging.c 1 file changed, 30 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/20317/1 diff --git a/src/logging.c b/src/logging.c index b538754..3d05bef 100644 --- a/src/logging.c +++ b/src/logging.c @@ -867,6 +867,24 @@ } #if (!EMBEDDED) +/* write-queue tells us we should write another msgb (log line) to the output fd */ +static int _file_wq_write_cb(struct osmo_fd *ofd, struct msgb *msg) +{ + int rc; + + rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); + if (rc < 0) + return rc; + if (rc != msgb_length(msg)) { + /* pull the number of bytes we have already written */ + msgb_pull(msg, rc); + /* ask write_queue to re-insert the msgb at the head of the queue */ + return -EAGAIN; + } + return 0; +} + +/* output via buffered, blocking stdio streams */ static void _file_output_stream(struct log_target *target, unsigned int level, const char *log) { @@ -892,6 +910,18 @@ * and call _file_wq_write_cb() */ rc = _output_buf((char *)msgb_data(msg), msgb_tailroom(msg), target, subsys, level, file, line, cont, format, ap); msgb_put(msg, rc); + + /* attempt a synchronous, non-blocking write, if the write queue is empty */ + if (target->tgt_file.wqueue->current_length == 0) { + rc = _file_wq_write_cb(&target->tgt_file.wqueue->bfd, msg); + if (rc == 0) { + /* the write was complete, we can exit early */ + msgb_free(msg); + return; + } + } + /* if we reach here, either we already had elements in the write_queue, or the synchronous write + * failed: enqueue the message to the write_queue (backlog) */ osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); } #endif @@ -963,23 +993,6 @@ } #if (!EMBEDDED) -/* write-queue tells us we should write another msgb (log line) to the output fd */ -static int _file_wq_write_cb(struct osmo_fd *ofd, struct msgb *msg) -{ - int rc; - - rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); - if (rc < 0) - return rc; - if (rc != msgb_length(msg)) { - /* pull the number of bytes we have already written */ - msgb_pull(msg, rc); - /* ask write_queue to re-insert the msgb at the head of the queue */ - return -EAGAIN; - } - return 0; -} - /*! Create a new file-based log target using buffered, blocking stream output * \param[in] fname File name of the new log file * \returns Log target in case of success, NULL otherwise -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 19:06:57 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 19:06:57 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 to look at the new patch set (#4). Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... mgcp_vty: add user attributes to configuration commands To make clear which configuration changes (configure terminal) apply when, add appropriate user attributes to VTY commands. Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Depends: libosmocore Ia185dfd0c89214dc893af70736ff01dca3a7627e Related: SYS#4937 --- M include/osmocom/mgcp/vty.h M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c 3 files changed, 251 insertions(+), 183 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/20250/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 19:09:04 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 19:09:04 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 to look at the new patch set (#5). Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... mgcp_vty: add user attributes to configuration commands To make clear which configuration changes (configure terminal) apply when, add appropriate user attributes to VTY commands. Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Related: SYS#4937, OS#1601 --- M include/osmocom/mgcp/vty.h M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c 3 files changed, 251 insertions(+), 183 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/20250/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 19:52:13 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 19:52:13 +0000 Subject: Change in osmo-bts[master]: vty: add attributes to VTY commands indicating when they apply References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20318 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... vty: add attributes to VTY commands indicating when they apply Change-Id: Ifcdfcd157e5067fa2e4296d7c7e93a74087f49ff Related: SYS#4937, OS#1601 --- M include/osmo-bts/vty.h M src/common/vty.c M src/osmo-bts-trx/trx_vty.c 3 files changed, 201 insertions(+), 151 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/20318/1 diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index 8eb76a8..b6e3f0d 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -28,4 +28,10 @@ extern struct vty_app_info bts_vty_info; +enum bts_vty_cmd_attr { + BTS_VTY_ATTR_NEW_LCHAN, + BTS_VTY_TRX_POWERCYCLE, + /* NOTE: up to 32 entries */ +}; + #endif diff --git a/src/common/vty.c b/src/common/vty.c index d5993d6..c5d37f1 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -66,6 +66,8 @@ #define BTS_TRX_TS_STR BTS_TRX_STR TS_NR_STR #define BTS_TRX_TS_LCHAN_STR BTS_TRX_TS_STR LCHAN_NR_STR +#define X(x) (1 << x) + int g_vty_port_num = OSMO_VTY_PORT_BTS; struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_nr) @@ -137,6 +139,16 @@ .copyright = osmobts_copyright, .go_parent_cb = bts_vty_go_parent, .is_config_node = bts_vty_is_config_node, + .usr_attr_desc = { + [BTS_VTY_ATTR_NEW_LCHAN] = \ + "This command applies for newly created lchans", + [BTS_VTY_TRX_POWERCYCLE] = \ + "This command applies when the TRX powercycles or restarts", + }, + .usr_attr_letters = { + [BTS_VTY_ATTR_NEW_LCHAN] = 'N', + [BTS_VTY_TRX_POWERCYCLE] = 'T', + }, }; extern struct gsm_network bts_gsmnet; @@ -178,10 +190,10 @@ return CMD_SUCCESS; } - -DEFUN(cfg_bts_trx, cfg_bts_trx_cmd, - "trx <0-254>", - "Select a TRX to configure\n" "TRX number\n") +DEFUN_ATTR(cfg_bts_trx, cfg_bts_trx_cmd, + "trx <0-254>", + "Select a TRX to configure\n" "TRX number\n", + CMD_ATTR_IMMEDIATE) { int trx_nr = atoi(argv[0]); struct gsm_bts *bts = vty->index; @@ -360,11 +372,12 @@ } /* per-BTS configuration */ -DEFUN(cfg_bts, - cfg_bts_cmd, - "bts BTS_NR", - "Select a BTS to configure\n" - "BTS Number\n") +DEFUN_ATTR(cfg_bts, + cfg_bts_cmd, + "bts BTS_NR", + "Select a BTS to configure\n" + "BTS Number\n", + CMD_ATTR_IMMEDIATE) { struct gsm_network *gsmnet = gsmnet_from_vty(vty); int bts_nr = atoi(argv[0]); @@ -457,10 +470,11 @@ return CMD_WARNING; } -DEFUN(cfg_bts_rtp_jitbuf, - cfg_bts_rtp_jitbuf_cmd, - "rtp jitter-buffer <0-10000> [adaptive]", - RTP_STR "RTP jitter buffer\n" "jitter buffer in ms\n") +DEFUN_USRATTR(cfg_bts_rtp_jitbuf, + cfg_bts_rtp_jitbuf_cmd, + X(BTS_VTY_ATTR_NEW_LCHAN), + "rtp jitter-buffer <0-10000> [adaptive]", + RTP_STR "RTP jitter buffer\n" "jitter buffer in ms\n") { struct gsm_bts *bts = vty->index; @@ -508,10 +522,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_rtp_ip_dscp, - cfg_bts_rtp_ip_dscp_cmd, - "rtp ip-dscp <0-63>", - RTP_STR "Specify DSCP for RTP/IP packets\n" "The DSCP value (upper 6 bits of TOS)\n") +DEFUN_USRATTR(cfg_bts_rtp_ip_dscp, + cfg_bts_rtp_ip_dscp_cmd, + X(BTS_VTY_ATTR_NEW_LCHAN), + "rtp ip-dscp <0-63>", + RTP_STR "Specify DSCP for RTP/IP packets\n" "The DSCP value (upper 6 bits of TOS)\n") { struct gsm_bts *bts = vty->index; int dscp = atoi(argv[0]); @@ -523,11 +538,12 @@ #define PAG_STR "Paging related parameters\n" -DEFUN(cfg_bts_paging_queue_size, - cfg_bts_paging_queue_size_cmd, - "paging queue-size <1-1024>", - PAG_STR "Maximum length of BTS-internal paging queue\n" - "Maximum length of BTS-internal paging queue\n") +DEFUN_ATTR(cfg_bts_paging_queue_size, + cfg_bts_paging_queue_size_cmd, + "paging queue-size <1-1024>", + PAG_STR "Maximum length of BTS-internal paging queue\n" + "Maximum length of BTS-internal paging queue\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -536,11 +552,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_paging_lifetime, - cfg_bts_paging_lifetime_cmd, - "paging lifetime <0-60>", - PAG_STR "Maximum lifetime of a paging record\n" - "Maximum lifetime of a paging record (secods)\n") +DEFUN_ATTR(cfg_bts_paging_lifetime, + cfg_bts_paging_lifetime_cmd, + "paging lifetime <0-60>", + PAG_STR "Maximum lifetime of a paging record\n" + "Maximum lifetime of a paging record (secods)\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -551,13 +568,14 @@ #define AGCH_QUEUE_STR "AGCH queue mgmt\n" -DEFUN(cfg_bts_agch_queue_mgmt_params, - cfg_bts_agch_queue_mgmt_params_cmd, - "agch-queue-mgmt threshold <0-100> low <0-100> high <0-100000>", - AGCH_QUEUE_STR - "Threshold to start cleanup\nin %% of the maximum queue length\n" - "Low water mark for cleanup\nin %% of the maximum queue length\n" - "High water mark for cleanup\nin %% of the maximum queue length\n") +DEFUN_ATTR(cfg_bts_agch_queue_mgmt_params, + cfg_bts_agch_queue_mgmt_params_cmd, + "agch-queue-mgmt threshold <0-100> low <0-100> high <0-100000>", + AGCH_QUEUE_STR + "Threshold to start cleanup\nin %% of the maximum queue length\n" + "Low water mark for cleanup\nin %% of the maximum queue length\n" + "High water mark for cleanup\nin %% of the maximum queue length\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -568,11 +586,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_agch_queue_mgmt_default, - cfg_bts_agch_queue_mgmt_default_cmd, - "agch-queue-mgmt default", - AGCH_QUEUE_STR - "Reset clean parameters to default values\n") +DEFUN_ATTR(cfg_bts_agch_queue_mgmt_default, + cfg_bts_agch_queue_mgmt_default_cmd, + "agch-queue-mgmt default", + AGCH_QUEUE_STR + "Reset clean parameters to default values\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -583,10 +602,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_ul_power_target, cfg_bts_ul_power_target_cmd, - "uplink-power-target <-110-0>", - "Set the nominal target Rx Level for uplink power control loop\n" - "Target uplink Rx level in dBm\n") +DEFUN_ATTR(cfg_bts_ul_power_target, cfg_bts_ul_power_target_cmd, + "uplink-power-target <-110-0>", + "Set the nominal target Rx Level for uplink power control loop\n" + "Target uplink Rx level in dBm\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -595,10 +615,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_min_qual_rach, cfg_bts_min_qual_rach_cmd, - "min-qual-rach <-100-100>", - "Set the minimum link quality level of Access Bursts to be accepted\n" - "C/I (Carrier-to-Interference) ratio in centiBels (10e-2 B or 10e-1 dB)\n") +DEFUN_ATTR(cfg_bts_min_qual_rach, cfg_bts_min_qual_rach_cmd, + "min-qual-rach <-100-100>", + "Set the minimum link quality level of Access Bursts to be accepted\n" + "C/I (Carrier-to-Interference) ratio in centiBels (10e-2 B or 10e-1 dB)\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -607,10 +628,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_min_qual_norm, cfg_bts_min_qual_norm_cmd, - "min-qual-norm <-100-100>", - "Set the minimum link quality level of Normal Bursts to be accepted\n" - "C/I (Carrier-to-Interference) ratio in centiBels (10e-2 B or 10e-1 dB)\n") +DEFUN_ATTR(cfg_bts_min_qual_norm, cfg_bts_min_qual_norm_cmd, + "min-qual-norm <-100-100>", + "Set the minimum link quality level of Normal Bursts to be accepted\n" + "C/I (Carrier-to-Interference) ratio in centiBels (10e-2 B or 10e-1 dB)\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -619,10 +641,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_max_ber_rach, cfg_bts_max_ber_rach_cmd, - "max-ber10k-rach <0-10000>", - "Set the maximum BER for valid RACH requests\n" - "BER in 1/10000 units (0=no BER; 100=1% BER)\n") +DEFUN_ATTR(cfg_bts_max_ber_rach, cfg_bts_max_ber_rach_cmd, + "max-ber10k-rach <0-10000>", + "Set the maximum BER for valid RACH requests\n" + "BER in 1/10000 units (0=no BER; 100=1% BER)\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -647,10 +670,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_supp_meas_toa256, cfg_bts_supp_meas_toa256_cmd, - "supp-meas-info toa256", - "Configure the RSL Supplementary Measurement Info\n" - "Report the TOA in 1/256th symbol periods\n") +DEFUN_ATTR(cfg_bts_supp_meas_toa256, cfg_bts_supp_meas_toa256_cmd, + "supp-meas-info toa256", + "Configure the RSL Supplementary Measurement Info\n" + "Report the TOA in 1/256th symbol periods\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -658,10 +682,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_no_supp_meas_toa256, cfg_bts_no_supp_meas_toa256_cmd, - "no supp-meas-info toa256", - NO_STR "Configure the RSL Supplementary Measurement Info\n" - "Report the TOA in 1/256th symbol periods\n") +DEFUN_ATTR(cfg_bts_no_supp_meas_toa256, cfg_bts_no_supp_meas_toa256_cmd, + "no supp-meas-info toa256", + NO_STR "Configure the RSL Supplementary Measurement Info\n" + "Report the TOA in 1/256th symbol periods\n", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; @@ -669,27 +694,30 @@ return CMD_SUCCESS; } -DEFUN(cfg_bts_smscb_max_qlen, cfg_bts_smscb_max_qlen_cmd, - "smscb queue-max-length <1-60>", - "Maximum queue length for SMSCB (CBCH) queue. In count of messages/pages (Default: 15)") +DEFUN_ATTR(cfg_bts_smscb_max_qlen, cfg_bts_smscb_max_qlen_cmd, + "smscb queue-max-length <1-60>", + "Maximum queue length for SMSCB (CBCH) queue. In count of messages/pages (Default: 15)", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; bts->smscb_queue_max_len = atoi(argv[0]); return CMD_SUCCESS; } -DEFUN(cfg_bts_smscb_tgt_qlen, cfg_bts_smscb_tgt_qlen_cmd, - "smscb queue-target-length <1-30>", - "Target queue length for SMSCB (CBCH) queue. In count of messages/pages (Default: 2)") +DEFUN_ATTR(cfg_bts_smscb_tgt_qlen, cfg_bts_smscb_tgt_qlen_cmd, + "smscb queue-target-length <1-30>", + "Target queue length for SMSCB (CBCH) queue. In count of messages/pages (Default: 2)", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; bts->smscb_queue_tgt_len = atoi(argv[0]); return CMD_SUCCESS; } -DEFUN(cfg_bts_smscb_qhyst, cfg_bts_smscb_qhyst_cmd, - "smscb queue-hysteresis <0-30>", - "Hysteresis for SMSCB (CBCH) queue. In count of messages/pages (Default: 2)") +DEFUN_ATTR(cfg_bts_smscb_qhyst, cfg_bts_smscb_qhyst_cmd, + "smscb queue-hysteresis <0-30>", + "Hysteresis for SMSCB (CBCH) queue. In count of messages/pages (Default: 2)", + CMD_ATTR_IMMEDIATE) { struct gsm_bts *bts = vty->index; bts->smscb_queue_hyst = atoi(argv[0]); @@ -763,7 +791,7 @@ DEFUN(cfg_trx_ms_power_control, cfg_trx_ms_power_control_cmd, "ms-power-control (dsp|osmo)", - "Mobile Station Power Level Control (change requires restart)\n" + "Mobile Station Power Level Control\n" "Handled by DSP\n" "Handled by OsmoBTS\n") { struct gsm_bts_trx *trx = vty->index; @@ -1474,9 +1502,10 @@ 1, }; -DEFUN(cfg_phy, cfg_phy_cmd, - "phy <0-255>", - "Select a PHY to configure\n" "PHY number\n") +DEFUN_ATTR(cfg_phy, cfg_phy_cmd, + "phy <0-255>", + "Select a PHY to configure\n" "PHY number\n", + CMD_ATTR_IMMEDIATE) { int phy_nr = atoi(argv[0]); struct phy_link *plink; @@ -1494,9 +1523,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_inst, cfg_phy_inst_cmd, - "instance <0-255>", - "Select a PHY instance to configure\n" "PHY Instance number\n") +DEFUN_ATTR(cfg_phy_inst, cfg_phy_inst_cmd, + "instance <0-255>", + "Select a PHY instance to configure\n" "PHY Instance number\n", + CMD_ATTR_IMMEDIATE) { int inst_nr = atoi(argv[0]); struct phy_link *plink = vty->index; diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 6b8ca77..cb719ee 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -48,6 +48,8 @@ #include "trx_if.h" #include "loops.h" +#define X(x) (1 << x) + #define OSMOTRX_STR "OsmoTRX Transceiver configuration\n" static struct gsm_bts *vty_bts; @@ -160,10 +162,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_trx_nominal_power, cfg_trx_nominal_power_cmd, - "nominal-tx-power <-10-100>", - "Manually set (force) the nominal transmit output power in dBm\n" - "Nominal transmit output power level in dBm\n") +DEFUN_USRATTR(cfg_trx_nominal_power, cfg_trx_nominal_power_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "nominal-tx-power <-10-100>", + "Manually set (force) the nominal transmit output power in dBm\n" + "Nominal transmit output power level in dBm\n") { struct gsm_bts_trx *trx = vty->index; struct phy_instance *pinst = trx_phy_instance(trx); @@ -176,10 +179,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_trx_no_nominal_power, cfg_trx_no_nominal_power_cmd, - "no nominal-tx-power", - NO_STR - "Manually set (force) the nominal transmit output power; ask the TRX instead (default)\n") +DEFUN_USRATTR(cfg_trx_no_nominal_power, cfg_trx_no_nominal_power_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "no nominal-tx-power", + NO_STR + "Manually set (force) the nominal transmit output power; ask the TRX instead (default)\n") { struct gsm_bts_trx *trx = vty->index; struct phy_instance *pinst = trx_phy_instance(trx); @@ -228,17 +232,18 @@ return CMD_SUCCESS; } -DEFUN(cfg_phyinst_maxdly, cfg_phyinst_maxdly_cmd, - "osmotrx maxdly <0-31>", - OSMOTRX_STR - "Set the maximum acceptable delay of an Access Burst (in GSM symbols)." - " Access Burst is the first burst a mobile transmits in order to establish" - " a connection and it is used to estimate Timing Advance (TA) which is" - " then applied to Normal Bursts to compensate for signal delay due to" - " distance. So changing this setting effectively changes maximum range of" - " the cell, because if we receive an Access Burst with a delay higher than" - " this value, it will be ignored and connection is dropped.\n" - "GSM symbols (approx. 1.1km per symbol)\n") +DEFUN_ATTR(cfg_phyinst_maxdly, cfg_phyinst_maxdly_cmd, + "osmotrx maxdly <0-31>", + OSMOTRX_STR + "Set the maximum acceptable delay of an Access Burst (in GSM symbols)." + " Access Burst is the first burst a mobile transmits in order to establish" + " a connection and it is used to estimate Timing Advance (TA) which is" + " then applied to Normal Bursts to compensate for signal delay due to" + " distance. So changing this setting effectively changes maximum range of" + " the cell, because if we receive an Access Burst with a delay higher than" + " this value, it will be ignored and connection is dropped.\n" + "GSM symbols (approx. 1.1km per symbol)\n", + CMD_ATTR_IMMEDIATE) { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -251,20 +256,20 @@ return CMD_SUCCESS; } - -DEFUN(cfg_phyinst_maxdlynb, cfg_phyinst_maxdlynb_cmd, - "osmotrx maxdlynb <0-31>", - OSMOTRX_STR - "Set the maximum acceptable delay of a Normal Burst (in GSM symbols)." - " USE FOR TESTING ONLY, DON'T CHANGE IN PRODUCTION USE!" - " During normal operation, Normal Bursts delay are controlled by a Timing" - " Advance control loop and thus Normal Bursts arrive to a BTS with no more" - " than a couple GSM symbols, which is already taken into account in osmo-trx." - " So changing this setting will have no effect in production installations" - " except increasing osmo-trx CPU load. This setting is only useful when" - " testing with a transmitter which can't precisely synchronize to the BTS" - " downlink signal, like e.g. R&S CMD57.\n" - "GSM symbols (approx. 1.1km per symbol)\n") +DEFUN_ATTR(cfg_phyinst_maxdlynb, cfg_phyinst_maxdlynb_cmd, + "osmotrx maxdlynb <0-31>", + OSMOTRX_STR + "Set the maximum acceptable delay of a Normal Burst (in GSM symbols)." + " USE FOR TESTING ONLY, DON'T CHANGE IN PRODUCTION USE!" + " During normal operation, Normal Bursts delay are controlled by a Timing" + " Advance control loop and thus Normal Bursts arrive to a BTS with no more" + " than a couple GSM symbols, which is already taken into account in osmo-trx." + " So changing this setting will have no effect in production installations" + " except increasing osmo-trx CPU load. This setting is only useful when" + " testing with a transmitter which can't precisely synchronize to the BTS" + " downlink signal, like e.g. R&S CMD57.\n" + "GSM symbols (approx. 1.1km per symbol)\n", + CMD_ATTR_IMMEDIATE) { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -319,12 +324,13 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_fn_advance, cfg_phy_fn_advance_cmd, - "osmotrx fn-advance <0-30>", - OSMOTRX_STR - "Set the number of frames to be transmitted to transceiver in advance " - "of current FN\n" - "Advance in frames\n") +DEFUN_ATTR(cfg_phy_fn_advance, cfg_phy_fn_advance_cmd, + "osmotrx fn-advance <0-30>", + OSMOTRX_STR + "Set the number of frames to be transmitted to transceiver in advance " + "of current FN\n" + "Advance in frames\n", + CMD_ATTR_IMMEDIATE) { struct phy_link *plink = vty->index; @@ -333,12 +339,13 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_rts_advance, cfg_phy_rts_advance_cmd, - "osmotrx rts-advance <0-30>", - OSMOTRX_STR - "Set the number of frames to be requested (PCU) in advance of current " - "FN. Do not change this, unless you have a good reason!\n" - "Advance in frames\n") +DEFUN_ATTR(cfg_phy_rts_advance, cfg_phy_rts_advance_cmd, + "osmotrx rts-advance <0-30>", + OSMOTRX_STR + "Set the number of frames to be requested (PCU) in advance of current " + "FN. Do not change this, unless you have a good reason!\n" + "Advance in frames\n", + CMD_ATTR_IMMEDIATE) { struct phy_link *plink = vty->index; @@ -347,11 +354,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_phyinst_rxgain, cfg_phyinst_rxgain_cmd, - "osmotrx rx-gain <0-50>", - OSMOTRX_STR - "Set the receiver gain in dB\n" - "Gain in dB\n") +DEFUN_ATTR(cfg_phyinst_rxgain, cfg_phyinst_rxgain_cmd, + "osmotrx rx-gain <0-50>", + OSMOTRX_STR + "Set the receiver gain in dB\n" + "Gain in dB\n", + CMD_ATTR_IMMEDIATE) { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -382,9 +390,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_phyinst_no_rxgain, cfg_phyinst_no_rxgain_cmd, - "no osmotrx rx-gain", - NO_STR OSMOTRX_STR "Unset the receiver gain in dB\n") +DEFUN_USRATTR(cfg_phyinst_no_rxgain, cfg_phyinst_no_rxgain_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "no osmotrx rx-gain", + NO_STR OSMOTRX_STR "Unset the receiver gain in dB\n") { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -394,10 +403,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_phyinst_no_maxdly, cfg_phyinst_no_maxdly_cmd, - "no osmotrx maxdly", - NO_STR OSMOTRX_STR - "Unset the maximum delay of GSM symbols\n") +DEFUN_USRATTR(cfg_phyinst_no_maxdly, cfg_phyinst_no_maxdly_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "no osmotrx maxdly", + NO_STR OSMOTRX_STR + "Unset the maximum delay of GSM symbols\n") { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -407,10 +417,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_phyinst_no_maxdlynb, cfg_phyinst_no_maxdlynb_cmd, - "no osmotrx maxdlynb", - NO_STR OSMOTRX_STR - "Unset the maximum delay of GSM symbols\n") +DEFUN_USRATTR(cfg_phyinst_no_maxdlynb, cfg_phyinst_no_maxdlynb_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "no osmotrx maxdlynb", + NO_STR OSMOTRX_STR + "Unset the maximum delay of GSM symbols\n") { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -467,9 +478,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_setbsic, cfg_phy_setbsic_cmd, - "osmotrx legacy-setbsic", OSMOTRX_STR - "Use SETBSIC to configure transceiver (use ONLY with OpenBTS Transceiver!)\n") +DEFUN_USRATTR(cfg_phy_setbsic, cfg_phy_setbsic_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "osmotrx legacy-setbsic", OSMOTRX_STR + "Use SETBSIC to configure transceiver (use ONLY with OpenBTS Transceiver!)\n") { struct phy_link *plink = vty->index; plink->u.osmotrx.use_legacy_setbsic = true; @@ -481,9 +493,10 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_no_setbsic, cfg_phy_no_setbsic_cmd, - "no osmotrx legacy-setbsic", - NO_STR OSMOTRX_STR "Disable Legacy SETBSIC to configure transceiver\n") +DEFUN_USRATTR(cfg_phy_no_setbsic, cfg_phy_no_setbsic_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "no osmotrx legacy-setbsic", + NO_STR OSMOTRX_STR "Disable Legacy SETBSIC to configure transceiver\n") { struct phy_link *plink = vty->index; plink->u.osmotrx.use_legacy_setbsic = false; @@ -491,11 +504,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_trxd_max_version, cfg_phy_trxd_max_version_cmd, - "osmotrx trxd-max-version (latest|<0-15>)", OSMOTRX_STR - "Set maximum TRXD format version to negotiate with TRX\n" - "Use latest supported TRXD format version (default)\n" - "Maximum TRXD format version number\n") +DEFUN_USRATTR(cfg_phy_trxd_max_version, cfg_phy_trxd_max_version_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "osmotrx trxd-max-version (latest|<0-15>)", OSMOTRX_STR + "Set maximum TRXD format version to negotiate with TRX\n" + "Use latest supported TRXD format version (default)\n" + "Maximum TRXD format version number\n") { struct phy_link *plink = vty->index; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcdfcd157e5067fa2e4296d7c7e93a74087f49ff Gerrit-Change-Number: 20318 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 20:04:51 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 20:04:51 +0000 Subject: Change in osmo-trx[master]: vty: add attributes to VTY commands indicating when they apply References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/20319 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... vty: add attributes to VTY commands indicating when they apply Change-Id: I6dfdedc081eb8c3d53913f6fa38591920c8b3b43 Related: SYS#4937, OS#1601 --- M CommonLibs/trx_vty.c 1 file changed, 23 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/19/20319/1 diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 3fcf888..9d8aecf 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -97,9 +97,10 @@ 1, }; -DEFUN(cfg_trx, cfg_trx_cmd, - "trx", - "Configure the TRX\n") +DEFUN_ATTR(cfg_trx, cfg_trx_cmd, + "trx", + "Configure the TRX\n", + CMD_ATTR_IMMEDIATE) { struct trx_ctx *trx = trx_from_vty(vty); @@ -415,12 +416,13 @@ INTV_STR_VAL(per-hour) \ INTV_STR_VAL(per-day) -DEFUN(cfg_ctr_error_threshold, cfg_ctr_error_threshold_cmd, - "ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS, - "Threshold rate for error counter\n" - THRESHOLD_STRS - "Value to set for threshold\n" - INTV_STRS) +DEFUN_ATTR(cfg_ctr_error_threshold, cfg_ctr_error_threshold_cmd, + "ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS, + "Threshold rate for error counter\n" + THRESHOLD_STRS + "Value to set for threshold\n" + INTV_STRS, + CMD_ATTR_IMMEDIATE) { int rc; struct ctr_threshold ctr; @@ -446,12 +448,13 @@ return CMD_SUCCESS; } -DEFUN(cfg_no_ctr_error_threshold, cfg_no_ctr_error_threshold_cmd, - "no ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS, - NO_STR "Threshold rate for error counter\n" - THRESHOLD_STRS - "Value to set for threshold\n" - INTV_STRS) +DEFUN_ATTR(cfg_no_ctr_error_threshold, cfg_no_ctr_error_threshold_cmd, + "no ctr-error-threshold " THRESHOLD_ARGS " <0-65535> " INTV_ARGS, + NO_STR "Threshold rate for error counter\n" + THRESHOLD_STRS + "Value to set for threshold\n" + INTV_STRS, + CMD_ATTR_IMMEDIATE) { int rc; struct ctr_threshold ctr; @@ -480,10 +483,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_chan, cfg_chan_cmd, - "chan <0-100>", - "Select a channel to configure\n" - "Channel index\n") +DEFUN_ATTR(cfg_chan, cfg_chan_cmd, + "chan <0-100>", + "Select a channel to configure\n" + "Channel index\n", + CMD_ATTR_IMMEDIATE) { struct trx_ctx *trx = trx_from_vty(vty); int idx = atoi(argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6dfdedc081eb8c3d53913f6fa38591920c8b3b43 Gerrit-Change-Number: 20319 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 21:28:59 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 21:28:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: allow to use IPV4 as default In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 ) Change subject: MSC_ConnectionHandler: allow to use IPV4 as default ...................................................................... MSC_ConnectionHandler: allow to use IPV4 as default When the BSC sends a CRCX without an IP address in it, the testcase will automatically assign an IPV6 address in the response. However, this breaks compatibility with older versions of osmo-bsc that do not have IPV6 support. Lets add a module parameter in order to be able to use IPV4 as default if required. Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 15 insertions(+), 3 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 7f670d2..34ee429 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -611,6 +611,8 @@ boolean mp_enable_osmux_test := true; /* Value set in osmo-bsc.cfg "ms max power" */ uint8_t mp_exp_ms_power_level := 7; + + boolean mp_media_mgw_offer_ipv6 := true; } private function f_gen_test_hdlr_pars(integer bssap_idx := 0) return TestHdlrParams { @@ -623,6 +625,7 @@ } pars.exp_ms_power_level := mp_exp_ms_power_level; pars.mscpool.bssap_idx := bssap_idx; + pars.media_mgw_offer_ipv6 := mp_media_mgw_offer_ipv6; return pars; } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index c372709..3d6538a 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -279,7 +279,14 @@ var MgcpOsmuxCID osmux_cid; var SDP_Message sdp; var integer cid := f_get_free_mgcp_conn(); - var charstring local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */ + var charstring local_rtp_addr; + + if (g_pars.media_mgw_offer_ipv6 == true) { + local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */ + } else { + local_rtp_addr := host_mgw_rtp_v4; /* Use IPv4 by default if no remote addr is provided by client */ + } + if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) { if (cid != 0) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX"); @@ -553,7 +560,8 @@ boolean aoip, boolean use_osmux, charstring host_aoip_tla, - TestHdlrParamsMSCPool mscpool + TestHdlrParamsMSCPool mscpool, + boolean media_mgw_offer_ipv6 }; /* Note: Do not use valueof() to get a value of this template, use @@ -587,7 +595,8 @@ bssap_idx := 0, rsl_idx := 0, l3_info := omit - } + }, + media_mgw_offer_ipv6 := true } function f_create_chan_and_exp() runs on MSC_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c Gerrit-Change-Number: 20232 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 21:32:31 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 21:32:31 +0000 Subject: Change in osmo-pcu[master]: vty: add attributes to VTY commands indicating when they apply References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20320 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... vty: add attributes to VTY commands indicating when they apply Change-Id: I63978ce3ea87593c9a41e503ed3b761c64e1e80f Related: SYS#4937, OS#1601 --- M src/pcu_vty.c M src/pcu_vty.h 2 files changed, 327 insertions(+), 260 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/20/20320/1 diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 0756136..bdb7adb 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -20,6 +20,8 @@ #include "tbf.h" #include "pcu_vty_functions.h" +#define X(x) (1 << x) + extern void *tall_pcu_ctx; static const struct value_string pcu_gsmtap_categ_names[] = { @@ -257,10 +259,11 @@ } /* per-BTS configuration */ -DEFUN(cfg_pcu, - cfg_pcu_cmd, - "pcu", - "BTS specific configure") +DEFUN_ATTR(cfg_pcu, + cfg_pcu_cmd, + "pcu", + "BTS specific configure", + CMD_ATTR_IMMEDIATE) { vty->node = PCU_NODE; @@ -269,10 +272,11 @@ #define EGPRS_STR "EGPRS configuration\n" -DEFUN(cfg_pcu_egprs, - cfg_pcu_egprs_cmd, - "egprs only", - EGPRS_STR "Use EGPRS and disable plain GPRS\n") +DEFUN_USRATTR(cfg_pcu_egprs, + cfg_pcu_egprs_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "egprs only", + EGPRS_STR "Use EGPRS and disable plain GPRS\n") { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -281,10 +285,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_egprs, - cfg_pcu_no_egprs_cmd, - "no egprs", - NO_STR EGPRS_STR) +DEFUN_USRATTR(cfg_pcu_no_egprs, + cfg_pcu_no_egprs_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "no egprs", + NO_STR EGPRS_STR) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -293,11 +298,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_fc_interval, - cfg_pcu_fc_interval_cmd, - "flow-control-interval <1-10>", - "Interval between sending subsequent Flow Control PDUs\n" - "Interval time in seconds\n") +DEFUN_ATTR(cfg_pcu_fc_interval, + cfg_pcu_fc_interval_cmd, + "flow-control-interval <1-10>", + "Interval between sending subsequent Flow Control PDUs\n" + "Interval time in seconds\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -309,10 +315,11 @@ #define FC_BMAX_STR(who) "Force a fixed value for the " who " bucket size\n" #define FC_LR_STR(who) "Force a fixed value for the " who " leak rate\n" -DEFUN(cfg_pcu_fc_bvc_bucket_size, - cfg_pcu_fc_bvc_bucket_size_cmd, - "flow-control force-bvc-bucket-size <1-6553500>", - FC_STR FC_BMAX_STR("BVC") "Bucket size in octets\n") +DEFUN_ATTR(cfg_pcu_fc_bvc_bucket_size, + cfg_pcu_fc_bvc_bucket_size_cmd, + "flow-control force-bvc-bucket-size <1-6553500>", + FC_STR FC_BMAX_STR("BVC") "Bucket size in octets\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -321,10 +328,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_fc_bvc_bucket_size, - cfg_pcu_no_fc_bvc_bucket_size_cmd, - "no flow-control force-bvc-bucket-size", - NO_STR FC_STR FC_BMAX_STR("BVC")) +DEFUN_ATTR(cfg_pcu_no_fc_bvc_bucket_size, + cfg_pcu_no_fc_bvc_bucket_size_cmd, + "no flow-control force-bvc-bucket-size", + NO_STR FC_STR FC_BMAX_STR("BVC"), + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -333,10 +341,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_fc_bvc_leak_rate, - cfg_pcu_fc_bvc_leak_rate_cmd, - "flow-control force-bvc-leak-rate <1-6553500>", - FC_STR FC_LR_STR("BVC") "Leak rate in bit/s\n") +DEFUN_ATTR(cfg_pcu_fc_bvc_leak_rate, + cfg_pcu_fc_bvc_leak_rate_cmd, + "flow-control force-bvc-leak-rate <1-6553500>", + FC_STR FC_LR_STR("BVC") "Leak rate in bit/s\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -345,10 +354,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_fc_bvc_leak_rate, - cfg_pcu_no_fc_bvc_leak_rate_cmd, - "no flow-control force-bvc-leak-rate", - NO_STR FC_STR FC_LR_STR("BVC")) +DEFUN_ATTR(cfg_pcu_no_fc_bvc_leak_rate, + cfg_pcu_no_fc_bvc_leak_rate_cmd, + "no flow-control force-bvc-leak-rate", + NO_STR FC_STR FC_LR_STR("BVC"), + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -357,10 +367,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_fc_ms_bucket_size, - cfg_pcu_fc_ms_bucket_size_cmd, - "flow-control force-ms-bucket-size <1-6553500>", - FC_STR FC_BMAX_STR("default MS") "Bucket size in octets\n") +DEFUN_ATTR(cfg_pcu_fc_ms_bucket_size, + cfg_pcu_fc_ms_bucket_size_cmd, + "flow-control force-ms-bucket-size <1-6553500>", + FC_STR FC_BMAX_STR("default MS") "Bucket size in octets\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -369,10 +380,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_fc_ms_bucket_size, - cfg_pcu_no_fc_ms_bucket_size_cmd, - "no flow-control force-ms-bucket-size", - NO_STR FC_STR FC_BMAX_STR("default MS")) +DEFUN_ATTR(cfg_pcu_no_fc_ms_bucket_size, + cfg_pcu_no_fc_ms_bucket_size_cmd, + "no flow-control force-ms-bucket-size", + NO_STR FC_STR FC_BMAX_STR("default MS"), + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -381,10 +393,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_fc_ms_leak_rate, - cfg_pcu_fc_ms_leak_rate_cmd, - "flow-control force-ms-leak-rate <1-6553500>", - FC_STR FC_LR_STR("default MS") "Leak rate in bit/s\n") +DEFUN_ATTR(cfg_pcu_fc_ms_leak_rate, + cfg_pcu_fc_ms_leak_rate_cmd, + "flow-control force-ms-leak-rate <1-6553500>", + FC_STR FC_LR_STR("default MS") "Leak rate in bit/s\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -393,10 +406,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_fc_ms_leak_rate, - cfg_pcu_no_fc_ms_leak_rate_cmd, - "no flow-control force-ms-leak-rate", - NO_STR FC_STR FC_LR_STR("default MS")) +DEFUN_ATTR(cfg_pcu_no_fc_ms_leak_rate, + cfg_pcu_no_fc_ms_leak_rate_cmd, + "no flow-control force-ms-leak-rate", + NO_STR FC_STR FC_LR_STR("default MS"), + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -406,10 +420,11 @@ } #define FC_BTIME_STR "Set target downlink maximum queueing time (only affects the advertised bucket size)\n" -DEFUN(cfg_pcu_fc_bucket_time, - cfg_pcu_fc_bucket_time_cmd, - "flow-control bucket-time <1-65534>", - FC_STR FC_BTIME_STR "Time in centi-seconds\n") +DEFUN_ATTR(cfg_pcu_fc_bucket_time, + cfg_pcu_fc_bucket_time_cmd, + "flow-control bucket-time <1-65534>", + FC_STR FC_BTIME_STR "Time in centi-seconds\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -418,10 +433,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_fc_bucket_time, - cfg_pcu_no_fc_bucket_time_cmd, - "no flow-control bucket-time", - NO_STR FC_STR FC_BTIME_STR) +DEFUN_ATTR(cfg_pcu_no_fc_bucket_time, + cfg_pcu_no_fc_bucket_time_cmd, + "no flow-control bucket-time", + NO_STR FC_STR FC_BTIME_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -432,12 +448,13 @@ #define CS_STR "Coding Scheme configuration\n" -DEFUN(cfg_pcu_cs, - cfg_pcu_cs_cmd, - "cs <1-4> [<1-4>]", - CS_STR - "Initial CS value to be used (overrides BTS config)\n" - "Use a different initial CS value for the uplink") +DEFUN_ATTR(cfg_pcu_cs, + cfg_pcu_cs_cmd, + "cs <1-4> [<1-4>]", + CS_STR + "Initial CS value to be used (overrides BTS config)\n" + "Use a different initial CS value for the uplink", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); uint8_t cs = atoi(argv[0]); @@ -452,10 +469,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_cs, - cfg_pcu_no_cs_cmd, - "no cs", - NO_STR CS_STR) +DEFUN_ATTR(cfg_pcu_no_cs, + cfg_pcu_no_cs_cmd, + "no cs", + NO_STR CS_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -465,13 +483,14 @@ } #define CS_MAX_STR "Set maximum values for adaptive CS selection (overrides BTS config)\n" -DEFUN(cfg_pcu_cs_max, - cfg_pcu_cs_max_cmd, - "cs max <1-4> [<1-4>]", - CS_STR - CS_MAX_STR - "Maximum CS value to be used\n" - "Use a different maximum CS value for the uplink") +DEFUN_ATTR(cfg_pcu_cs_max, + cfg_pcu_cs_max_cmd, + "cs max <1-4> [<1-4>]", + CS_STR + CS_MAX_STR + "Maximum CS value to be used\n" + "Use a different maximum CS value for the uplink", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); uint8_t cs = atoi(argv[0]); @@ -485,10 +504,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_cs_max, - cfg_pcu_no_cs_max_cmd, - "no cs max", - NO_STR CS_STR CS_MAX_STR) +DEFUN_ATTR(cfg_pcu_no_cs_max, + cfg_pcu_no_cs_max_cmd, + "no cs max", + NO_STR CS_STR CS_MAX_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -499,13 +519,13 @@ } #define MCS_STR "Modulation and Coding Scheme configuration (EGPRS)\n" - -DEFUN(cfg_pcu_mcs, - cfg_pcu_mcs_cmd, - "mcs <1-9> [<1-9>]", - MCS_STR - "Initial MCS value to be used (default 1)\n" - "Use a different initial MCS value for the uplink") +DEFUN_ATTR(cfg_pcu_mcs, + cfg_pcu_mcs_cmd, + "mcs <1-9> [<1-9>]", + MCS_STR + "Initial MCS value to be used (default 1)\n" + "Use a different initial MCS value for the uplink", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); uint8_t cs = atoi(argv[0]); @@ -519,10 +539,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_mcs, - cfg_pcu_no_mcs_cmd, - "no mcs", - NO_STR MCS_STR) +DEFUN_ATTR(cfg_pcu_no_mcs, + cfg_pcu_no_mcs_cmd, + "no mcs", + NO_STR MCS_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -532,13 +553,14 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_mcs_max, - cfg_pcu_mcs_max_cmd, - "mcs max <1-9> [<1-9>]", - MCS_STR - CS_MAX_STR - "Maximum MCS value to be used\n" - "Use a different maximum MCS value for the uplink") +DEFUN_ATTR(cfg_pcu_mcs_max, + cfg_pcu_mcs_max_cmd, + "mcs max <1-9> [<1-9>]", + MCS_STR + CS_MAX_STR + "Maximum MCS value to be used\n" + "Use a different maximum MCS value for the uplink", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); uint8_t mcs = atoi(argv[0]); @@ -552,10 +574,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_mcs_max, - cfg_pcu_no_mcs_max_cmd, - "no mcs max", - NO_STR MCS_STR CS_MAX_STR) +DEFUN_ATTR(cfg_pcu_no_mcs_max, + cfg_pcu_no_mcs_max_cmd, + "no mcs max", + NO_STR MCS_STR CS_MAX_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -567,12 +590,13 @@ #define DL_STR "downlink specific configuration\n" -DEFUN(cfg_pcu_dl_arq_type, - cfg_pcu_dl_arq_cmd, - "egprs dl arq-type (spb|arq2)", - EGPRS_STR DL_STR "ARQ options\n" - "enable SPB(ARQ1) support\n" - "enable ARQ2 support") +DEFUN_ATTR(cfg_pcu_dl_arq_type, + cfg_pcu_dl_arq_cmd, + "egprs dl arq-type (spb|arq2)", + EGPRS_STR DL_STR "ARQ options\n" + "enable SPB(ARQ1) support\n" + "enable ARQ2 support", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -584,12 +608,13 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_window_size, - cfg_pcu_window_size_cmd, - "window-size <0-1024> [<0-256>]", - "Window size configuration (b + N_PDCH * f)\n" - "Base value (b)\n" - "Factor for number of PDCH (f)") +DEFUN_USRATTR(cfg_pcu_window_size, + cfg_pcu_window_size_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "window-size <0-1024> [<0-256>]", + "Window size configuration (b + N_PDCH * f)\n" + "Base value (b)\n" + "Factor for number of PDCH (f)") { struct gprs_rlcmac_bts *bts = bts_main_data(); uint16_t b = atoi(argv[0]); @@ -608,10 +633,11 @@ #define LIFETIME_STR "Set lifetime limit of LLC frame in centi-seconds " \ "(overrides the value given by SGSN)\n" -DEFUN(cfg_pcu_queue_lifetime, - cfg_pcu_queue_lifetime_cmd, - "queue lifetime <1-65534>", - QUEUE_STR LIFETIME_STR "Lifetime in centi-seconds") +DEFUN_USRATTR(cfg_pcu_queue_lifetime, + cfg_pcu_queue_lifetime_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "queue lifetime <1-65534>", + QUEUE_STR LIFETIME_STR "Lifetime in centi-seconds") { struct gprs_rlcmac_bts *bts = bts_main_data(); uint16_t csec = atoi(argv[0]); @@ -621,10 +647,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_queue_lifetime_inf, - cfg_pcu_queue_lifetime_inf_cmd, - "queue lifetime infinite", - QUEUE_STR LIFETIME_STR "Infinite lifetime") +DEFUN_USRATTR(cfg_pcu_queue_lifetime_inf, + cfg_pcu_queue_lifetime_inf_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "queue lifetime infinite", + QUEUE_STR LIFETIME_STR "Infinite lifetime") { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -633,11 +660,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_queue_lifetime, - cfg_pcu_no_queue_lifetime_cmd, - "no queue lifetime", - NO_STR QUEUE_STR "Disable lifetime limit of LLC frame (use value given " - "by SGSN)\n") +DEFUN_USRATTR(cfg_pcu_no_queue_lifetime, + cfg_pcu_no_queue_lifetime_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "no queue lifetime", + NO_STR QUEUE_STR "Disable lifetime limit of LLC frame (use value given " + "by SGSN)\n") { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -649,10 +677,11 @@ #define QUEUE_HYSTERESIS_STR "Set lifetime hysteresis of LLC frame in centi-seconds " \ "(continue discarding until lifetime-hysteresis is reached)\n" -DEFUN(cfg_pcu_queue_hysteresis, - cfg_pcu_queue_hysteresis_cmd, - "queue hysteresis <1-65535>", - QUEUE_STR QUEUE_HYSTERESIS_STR "Hysteresis in centi-seconds") +DEFUN_USRATTR(cfg_pcu_queue_hysteresis, + cfg_pcu_queue_hysteresis_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "queue hysteresis <1-65535>", + QUEUE_STR QUEUE_HYSTERESIS_STR "Hysteresis in centi-seconds") { struct gprs_rlcmac_bts *bts = bts_main_data(); uint16_t csec = atoi(argv[0]); @@ -662,10 +691,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_queue_hysteresis, - cfg_pcu_no_queue_hysteresis_cmd, - "no queue hysteresis", - NO_STR QUEUE_STR QUEUE_HYSTERESIS_STR) +DEFUN_USRATTR(cfg_pcu_no_queue_hysteresis, + cfg_pcu_no_queue_hysteresis_cmd, + X(PCU_VTY_ATTR_NEW_TBF), + "no queue hysteresis", + NO_STR QUEUE_STR QUEUE_HYSTERESIS_STR) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -675,11 +705,11 @@ } #define QUEUE_CODEL_STR "Set CoDel queue management\n" - -DEFUN(cfg_pcu_queue_codel, - cfg_pcu_queue_codel_cmd, - "queue codel", - QUEUE_STR QUEUE_CODEL_STR) +DEFUN_USRATTR(cfg_pcu_queue_codel, + cfg_pcu_queue_codel_cmd, + X(PCU_VTY_ATTR_NEW_SUBSCR), + "queue codel", + QUEUE_STR QUEUE_CODEL_STR) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -688,10 +718,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_queue_codel_interval, - cfg_pcu_queue_codel_interval_cmd, - "queue codel interval <1-1000>", - QUEUE_STR QUEUE_CODEL_STR "Specify interval\n" "Interval in centi-seconds") +DEFUN_USRATTR(cfg_pcu_queue_codel_interval, + cfg_pcu_queue_codel_interval_cmd, + X(PCU_VTY_ATTR_NEW_SUBSCR), + "queue codel interval <1-1000>", + QUEUE_STR QUEUE_CODEL_STR "Specify interval\n" "Interval in centi-seconds") { struct gprs_rlcmac_bts *bts = bts_main_data(); uint16_t csec = atoi(argv[0]); @@ -701,10 +732,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_queue_codel, - cfg_pcu_no_queue_codel_cmd, - "no queue codel", - NO_STR QUEUE_STR QUEUE_CODEL_STR) +DEFUN_USRATTR(cfg_pcu_no_queue_codel, + cfg_pcu_no_queue_codel_cmd, + X(PCU_VTY_ATTR_NEW_SUBSCR), + "no queue codel", + NO_STR QUEUE_STR QUEUE_CODEL_STR) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -716,10 +748,11 @@ #define QUEUE_IDLE_ACK_STR "Request an ACK after the last DL LLC frame in centi-seconds\n" -DEFUN(cfg_pcu_queue_idle_ack_delay, - cfg_pcu_queue_idle_ack_delay_cmd, - "queue idle-ack-delay <1-65535>", - QUEUE_STR QUEUE_IDLE_ACK_STR "Idle ACK delay in centi-seconds") +DEFUN_ATTR(cfg_pcu_queue_idle_ack_delay, + cfg_pcu_queue_idle_ack_delay_cmd, + "queue idle-ack-delay <1-65535>", + QUEUE_STR QUEUE_IDLE_ACK_STR "Idle ACK delay in centi-seconds", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); uint16_t csec = atoi(argv[0]); @@ -729,10 +762,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_queue_idle_ack_delay, - cfg_pcu_no_queue_idle_ack_delay_cmd, - "no queue idle-ack-delay", - NO_STR QUEUE_STR QUEUE_IDLE_ACK_STR) +DEFUN_ATTR(cfg_pcu_no_queue_idle_ack_delay, + cfg_pcu_no_queue_idle_ack_delay_cmd, + "no queue idle-ack-delay", + NO_STR QUEUE_STR QUEUE_IDLE_ACK_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -741,15 +775,15 @@ return CMD_SUCCESS; } - -DEFUN(cfg_pcu_alloc, - cfg_pcu_alloc_cmd, - "alloc-algorithm (a|b|dynamic)", - "Select slot allocation algorithm to use when assigning timeslots on " - "PACCH\n" - "Single slot is assigned only\n" - "Multiple slots are assigned for semi-duplex operation\n" - "Dynamically select the algorithm based on the system state\n") +DEFUN_ATTR(cfg_pcu_alloc, + cfg_pcu_alloc_cmd, + "alloc-algorithm (a|b|dynamic)", + "Select slot allocation algorithm to use when assigning timeslots on " + "PACCH\n" + "Single slot is assigned only\n" + "Multiple slots are assigned for semi-duplex operation\n" + "Dynamically select the algorithm based on the system state\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -768,10 +802,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_two_phase, - cfg_pcu_two_phase_cmd, - "two-phase-access", - "Force two phase access when MS requests single phase access\n") +DEFUN_ATTR(cfg_pcu_two_phase, + cfg_pcu_two_phase_cmd, + "two-phase-access", + "Force two phase access when MS requests single phase access\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -780,10 +815,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_two_phase, - cfg_pcu_no_two_phase_cmd, - "no two-phase-access", - NO_STR "Only use two phase access when requested my MS\n") +DEFUN_ATTR(cfg_pcu_no_two_phase, + cfg_pcu_no_two_phase_cmd, + "no two-phase-access", + NO_STR "Only use two phase access when requested my MS\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -792,12 +828,13 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_alpha, - cfg_pcu_alpha_cmd, - "alpha <0-10>", - "Alpha parameter for MS power control in units of 0.1 (see TS 05.08) " - "NOTE: Be sure to set Alpha value at System information 13 too.\n" - "Alpha in units of 0.1\n") +DEFUN_ATTR(cfg_pcu_alpha, + cfg_pcu_alpha_cmd, + "alpha <0-10>", + "Alpha parameter for MS power control in units of 0.1 (see TS 05.08) " + "NOTE: Be sure to set Alpha value at System information 13 too.\n" + "Alpha in units of 0.1\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -806,11 +843,12 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_gamma, - cfg_pcu_gamma_cmd, - "gamma <0-62>", - "Gamma parameter for MS power control in units of dB (see TS 05.08)\n" - "Gamma in even unit of dBs\n") +DEFUN_ATTR(cfg_pcu_gamma, + cfg_pcu_gamma_cmd, + "gamma <0-62>", + "Gamma parameter for MS power control in units of dB (see TS 05.08)\n" + "Gamma in even unit of dBs\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -867,10 +905,11 @@ #define RETRANSMISSION_STR "retransmit blocks even before the MS had a chance to receive them (better throughput," \ " less readable traces)" -DEFUN(cfg_pcu_dl_tbf_preemptive_retransmission, - cfg_pcu_dl_tbf_preemptive_retransmission_cmd, - "dl-tbf-preemptive-retransmission", - RETRANSMISSION_STR " (enabled by default)") +DEFUN_ATTR(cfg_pcu_dl_tbf_preemptive_retransmission, + cfg_pcu_dl_tbf_preemptive_retransmission_cmd, + "dl-tbf-preemptive-retransmission", + RETRANSMISSION_STR " (enabled by default)", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -879,10 +918,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_dl_tbf_preemptive_retransmission, - cfg_pcu_no_dl_tbf_preemptive_retransmission_cmd, - "no dl-tbf-preemptive-retransmission", - NO_STR RETRANSMISSION_STR) +DEFUN_ATTR(cfg_pcu_no_dl_tbf_preemptive_retransmission, + cfg_pcu_no_dl_tbf_preemptive_retransmission_cmd, + "no dl-tbf-preemptive-retransmission", + NO_STR RETRANSMISSION_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -921,10 +961,11 @@ } #define CS_ERR_LIMITS_STR "set thresholds for error rate based downlink (M)CS adjustment\n" -DEFUN(cfg_pcu_cs_err_limits, - cfg_pcu_cs_err_limits_cmd, - "cs threshold <0-100> <0-100>", - CS_STR CS_ERR_LIMITS_STR "lower limit in %\n" "upper limit in %\n") +DEFUN_ATTR(cfg_pcu_cs_err_limits, + cfg_pcu_cs_err_limits_cmd, + "cs threshold <0-100> <0-100>", + CS_STR CS_ERR_LIMITS_STR "lower limit in %\n" "upper limit in %\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -945,10 +986,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_cs_err_limits, - cfg_pcu_no_cs_err_limits_cmd, - "no cs threshold", - NO_STR CS_STR CS_ERR_LIMITS_STR) +DEFUN_ATTR(cfg_pcu_no_cs_err_limits, + cfg_pcu_no_cs_err_limits_cmd, + "no cs threshold", + NO_STR CS_STR CS_ERR_LIMITS_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -960,10 +1002,11 @@ } #define CS_DOWNGRADE_STR "set threshold for data size based downlink (M)CS downgrade\n" -DEFUN(cfg_pcu_cs_downgrade_thrsh, - cfg_pcu_cs_downgrade_thrsh_cmd, - "cs downgrade-threshold <1-10000>", - CS_STR CS_DOWNGRADE_STR "downgrade if less octets left\n") +DEFUN_ATTR(cfg_pcu_cs_downgrade_thrsh, + cfg_pcu_cs_downgrade_thrsh_cmd, + "cs downgrade-threshold <1-10000>", + CS_STR CS_DOWNGRADE_STR "downgrade if less octets left\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -972,10 +1015,11 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_no_cs_downgrade_thrsh, - cfg_pcu_no_cs_downgrade_thrsh_cmd, - "no cs downgrade-threshold", - NO_STR CS_STR CS_DOWNGRADE_STR) +DEFUN_ATTR(cfg_pcu_no_cs_downgrade_thrsh, + cfg_pcu_no_cs_downgrade_thrsh_cmd, + "no cs downgrade-threshold", + NO_STR CS_STR CS_DOWNGRADE_STR, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -984,21 +1028,21 @@ return CMD_SUCCESS; } - -DEFUN(cfg_pcu_cs_lqual_ranges, - cfg_pcu_cs_lqual_ranges_cmd, - "cs link-quality-ranges cs1 <0-35> cs2 <0-35> <0-35> cs3 <0-35> <0-35> cs4 <0-35>", - CS_STR "Set link quality ranges for each uplink CS\n" - "Set quality range for CS-1 (high value only)\n" - "CS-1 high (dB)\n" - "Set quality range for CS-2\n" - "CS-2 low (dB)\n" - "CS-2 high (dB)\n" - "Set quality range for CS-3\n" - "CS-3 low (dB)\n" - "CS-3 high (dB)\n" - "Set quality range for CS-4 (low value only)\n" - "CS-4 low (dB)\n") +DEFUN_ATTR(cfg_pcu_cs_lqual_ranges, + cfg_pcu_cs_lqual_ranges_cmd, + "cs link-quality-ranges cs1 <0-35> cs2 <0-35> <0-35> cs3 <0-35> <0-35> cs4 <0-35>", + CS_STR "Set link quality ranges for each uplink CS\n" + "Set quality range for CS-1 (high value only)\n" + "CS-1 high (dB)\n" + "Set quality range for CS-2\n" + "CS-2 low (dB)\n" + "CS-2 high (dB)\n" + "Set quality range for CS-3\n" + "CS-3 low (dB)\n" + "CS-3 high (dB)\n" + "Set quality range for CS-4 (low value only)\n" + "CS-4 low (dB)\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -1019,35 +1063,36 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_mcs_lqual_ranges, - cfg_pcu_mcs_lqual_ranges_cmd, - "mcs link-quality-ranges mcs1 <0-35> mcs2 <0-35> <0-35> mcs3 <0-35> <0-35> mcs4 <0-35> <0-35> mcs5 <0-35> <0-35> mcs6 <0-35> <0-35> mcs7 <0-35> <0-35> mcs8 <0-35> <0-35> mcs9 <0-35>", - CS_STR "Set link quality ranges for each uplink MCS\n" - "Set quality range for MCS-1 (high value only)\n" - "MCS-1 high (dB)\n" - "Set quality range for MCS-2\n" - "MCS-2 high (dB)\n" - "MCS-2 low (dB)\n" - "Set quality range for MCS-3\n" - "MCS-3 high (dB)\n" - "MCS-3 low (dB)\n" - "Set quality range for MCS-4\n" - "MCS-4 high (dB)\n" - "MCS-4 low (dB)\n" - "Set quality range for MCS-5\n" - "MCS-5 high (dB)\n" - "MCS-5 low (dB)\n" - "Set quality range for MCS-6\n" - "MCS-6 low (dB)\n" - "MCS-6 high (dB)\n" - "Set quality range for MCS-7\n" - "MCS-7 low (dB)\n" - "MCS-7 high (dB)\n" - "Set quality range for MCS-8\n" - "MCS-8 low (dB)\n" - "MCS-8 high (dB)\n" - "Set quality range for MCS-9 (low value only)\n" - "MCS-9 low (dB)\n") +DEFUN_ATTR(cfg_pcu_mcs_lqual_ranges, + cfg_pcu_mcs_lqual_ranges_cmd, + "mcs link-quality-ranges mcs1 <0-35> mcs2 <0-35> <0-35> mcs3 <0-35> <0-35> mcs4 <0-35> <0-35> mcs5 <0-35> <0-35> mcs6 <0-35> <0-35> mcs7 <0-35> <0-35> mcs8 <0-35> <0-35> mcs9 <0-35>", + CS_STR "Set link quality ranges for each uplink MCS\n" + "Set quality range for MCS-1 (high value only)\n" + "MCS-1 high (dB)\n" + "Set quality range for MCS-2\n" + "MCS-2 high (dB)\n" + "MCS-2 low (dB)\n" + "Set quality range for MCS-3\n" + "MCS-3 high (dB)\n" + "MCS-3 low (dB)\n" + "Set quality range for MCS-4\n" + "MCS-4 high (dB)\n" + "MCS-4 low (dB)\n" + "Set quality range for MCS-5\n" + "MCS-5 high (dB)\n" + "MCS-5 low (dB)\n" + "Set quality range for MCS-6\n" + "MCS-6 low (dB)\n" + "MCS-6 high (dB)\n" + "Set quality range for MCS-7\n" + "MCS-7 low (dB)\n" + "MCS-7 high (dB)\n" + "Set quality range for MCS-8\n" + "MCS-8 low (dB)\n" + "MCS-8 high (dB)\n" + "Set quality range for MCS-9 (low value only)\n" + "MCS-9 low (dB)\n", + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -1087,12 +1132,13 @@ return CMD_SUCCESS; } -DEFUN(cfg_pcu_gb_dialect, - cfg_pcu_gb_dialect_cmd, - "gb-dialect (classic|ip-sns)", - "Select which Gb interface dialect to use\n" - "Classic Gb interface with NS-{RESET,BLOCK,UNBLOCK} and static configuration\n" - "Modern Gb interface with IP-SNS (Sub Network Service) and dynamic configuration\n") +DEFUN_USRATTR(cfg_pcu_gb_dialect, + cfg_pcu_gb_dialect_cmd, + X(PCU_VTY_ATTR_NS_RECONNECT), + "gb-dialect (classic|ip-sns)", + "Select which Gb interface dialect to use\n" + "Classic Gb interface with NS-{RESET,BLOCK,UNBLOCK} and static configuration\n" + "Modern Gb interface with IP-SNS (Sub Network Service) and dynamic configuration\n") { struct gprs_rlcmac_bts *bts = bts_main_data(); @@ -1124,10 +1170,11 @@ return osmo_tdef_vty_show_cmd(vty, bts->T_defs_pcu, T_arg, NULL); } -DEFUN(cfg_pcu_timer, cfg_pcu_timer_cmd, - "timer " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, - "Configure or show PCU timers\n" - OSMO_TDEF_VTY_DOC_SET) +DEFUN_ATTR(cfg_pcu_timer, cfg_pcu_timer_cmd, + "timer " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, + "Configure or show PCU timers\n" + OSMO_TDEF_VTY_DOC_SET, + CMD_ATTR_IMMEDIATE) { struct gprs_rlcmac_bts *bts = bts_main_data(); /* If any arguments are missing, redirect to 'show' */ @@ -1199,6 +1246,19 @@ .name = "OsmoPCU", .version = PACKAGE_VERSION, .copyright = pcu_copyright, + .usr_attr_desc = { + [PCU_VTY_ATTR_NEW_TBF] = \ + "This command applies when a new TBF is begins", + [PCU_VTY_ATTR_NEW_SUBSCR] = \ + "This command applies when a new subscriber attaches", + [PCU_VTY_ATTR_NS_RECONNECT] = \ + "This command applies when the NS reconnects", + }, + .usr_attr_letters = { + [PCU_VTY_ATTR_NEW_TBF] = 'N', + [PCU_VTY_ATTR_NEW_SUBSCR] = 'S', + [PCU_VTY_ATTR_NS_RECONNECT] = 'R', + }, }; int pcu_vty_init(void) diff --git a/src/pcu_vty.h b/src/pcu_vty.h index 2097561..4b74137 100644 --- a/src/pcu_vty.h +++ b/src/pcu_vty.h @@ -16,5 +16,12 @@ extern struct vty_app_info pcu_vty_info; +enum bsc_vty_cmd_attr { + PCU_VTY_ATTR_NEW_TBF = 0, + PCU_VTY_ATTR_NEW_SUBSCR, + PCU_VTY_ATTR_NS_RECONNECT, + /* NOTE: up to 32 entries */ +}; + #endif /* _PCU_VTY_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I63978ce3ea87593c9a41e503ed3b761c64e1e80f Gerrit-Change-Number: 20320 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 22:40:10 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 22:40:10 +0000 Subject: Change in docker-playground[master]: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20275 ) Change subject: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Gerrit-Change-Number: 20275 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 29 Sep 2020 22:40:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Sep 29 22:40:21 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 Sep 2020 22:40:21 +0000 Subject: Change in docker-playground[master]: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20275 ) Change subject: BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest ...................................................................... BSC_Tests: disable IPV6 parameter mp_media_mgw_offer_ipv6 for latest Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Depends: osmo-ttcn3-hacks I30c77abef63636bb02db12d2f2b2d79ea244b96c --- M ttcn3-bsc-test/BSC_Tests.cfg M ttcn3-bsc-test/jenkins.sh 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve dexter: Verified diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 6aef022..c1a5b81 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -13,6 +13,7 @@ BSC_Tests.mp_bsc_ip := "172.18.2.20"; BSC_Tests.mp_test_ip := "172.18.2.203"; BSC_Tests.mp_enable_osmux_test := true; +BSC_Tests.mp_media_mgw_offer_ipv6 := true; BSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index d026463..e8cade8 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -35,6 +35,7 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg sed "/fd02:db8/d" -i $VOL_BASE_DIR/bsc/osmo-bsc.cfg + sed -i "s/^BSC_Tests.mp_media_mgw_offer_ipv6.*/BSC_Tests.mp_media_mgw_offer_ipv6 := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg fi SUBNET=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I63f9d751c8b1347d2e14ab408830ba4858e133b2 Gerrit-Change-Number: 20275 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Sep 30 02:17:25 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 30 Sep 2020 02:17:25 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f73eac8f1dda_4a7b2b168713c5e03176ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 159s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 159s] [COMPILING libboard/qmod/source/card_pres.c] [ 159s] [COMPILING libboard/qmod/source/wwan_led.c] [ 159s] [COMPILING libboard/qmod/source/i2c.c] [ 159s] [COMPILING libboard/qmod/source/board_qmod.c] [ 159s] [COMPILING apps/dfu/main.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 160s] Memory region Used Size Region Size %age Used [ 160s] rom: 16588 B 16 KB 101.25% [ 160s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 160s] collect2: error: ld returned 1 exit status [ 160s] % [ 160s] make[2]: *** [Makefile:234: flash] Error 1 [ 160s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 160s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] dh_auto_build: error: make -j1 returned exit code 2 [ 160s] make: *** [debian/rules:16: build] Error 25 [ 160s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 160s] ### VM INTERACTION START ### [ 163s] [ 152.731838] sysrq: Power Off [ 163s] [ 152.737416] reboot: Power down [ 163s] ### VM INTERACTION END ### [ 163s] [ 163s] lamb17 failed "build simtrace2_0.7.0.63.39070.dsc" at Wed Sep 30 02:17:09 UTC 2020. [ 163s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 30 03:48:03 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 30 Sep 2020 03:48:03 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f73fffde2a58_4a7b2b168713c5e032161@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was build84:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Sep 30 03:51:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 30 Sep 2020 03:51:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f7400cd8a0c4_4a7b2b168713c5e03219fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb06:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Sep 30 05:14:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 30 Sep 2020 05:14:25 +0000 Subject: Change in osmo-bsc[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19670 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 8: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51 Gerrit-Change-Number: 19670 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 05:14:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:34:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:34:17 +0000 Subject: Change in osmo-bts[master]: vty: fix bts_dump_vty_features(): properly check BTS model flags In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20285 ) Change subject: vty: fix bts_dump_vty_features(): properly check BTS model flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88de79cc45fb64144df33b0ac3e3b91537039953 Gerrit-Change-Number: 20285 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:34:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:34:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:34:32 +0000 Subject: Change in osmo-bts[master]: bts: cosmetic: make param 'net' of gsm_bts_num() const In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20286 ) Change subject: bts: cosmetic: make param 'net' of gsm_bts_num() const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I378fea4aefb2cc4253cdd99ebc9c4f01b21faf95 Gerrit-Change-Number: 20286 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:34:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:34:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:34:59 +0000 Subject: Change in osmo-bts[master]: vty: cosmetic: use osmo_talloc_replace_string() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20287 ) Change subject: vty: cosmetic: use osmo_talloc_replace_string() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic195cef2aafec55d37152045f7714335ded0a62b Gerrit-Change-Number: 20287 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:34:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:35:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:35:14 +0000 Subject: Change in osmo-bts[master]: tx_power: make trx/lchan struct pointers const where possible In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20307 ) Change subject: tx_power: make trx/lchan struct pointers const where possible ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 Gerrit-Change-Number: 20307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:35:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:35:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:35:30 +0000 Subject: Change in osmo-bts[master]: vty: make most struct pointers const in show/write commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20288 ) Change subject: vty: make most struct pointers const in show/write commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iacc32f7982c150d84ea4df7affa1f9e07806928f Gerrit-Change-Number: 20288 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:35:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:35:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:35:31 +0000 Subject: Change in osmo-bts[master]: vty: fix bts_dump_vty_features(): properly check BTS model flags In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20285 ) Change subject: vty: fix bts_dump_vty_features(): properly check BTS model flags ...................................................................... vty: fix bts_dump_vty_features(): properly check BTS model flags bts_internal_flag_get() expects a flag value, not an integer. Change-Id: I88de79cc45fb64144df33b0ac3e3b91537039953 --- M src/common/vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index d5993d6..36b0eaf 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -848,9 +848,9 @@ vty_out(vty, " BTS model specific (internal) flags:%s", VTY_NEWLINE); for (i = 0, no_features = true; i < sizeof(bts->flags) * 8; i++) { - if (bts_internal_flag_get(bts, i)) { + if (bts_internal_flag_get(bts, (1 << i))) { vty_out(vty, " %03u ", i); - vty_out(vty, "%-40s%s", get_value_string(bts_impl_flag_desc, i), VTY_NEWLINE); + vty_out(vty, "%-40s%s", get_value_string(bts_impl_flag_desc, (1 << i)), VTY_NEWLINE); no_features = false; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88de79cc45fb64144df33b0ac3e3b91537039953 Gerrit-Change-Number: 20285 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:35:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:35:32 +0000 Subject: Change in osmo-bts[master]: bts: cosmetic: make param 'net' of gsm_bts_num() const In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20286 ) Change subject: bts: cosmetic: make param 'net' of gsm_bts_num() const ...................................................................... bts: cosmetic: make param 'net' of gsm_bts_num() const Change-Id: I378fea4aefb2cc4253cdd99ebc9c4f01b21faf95 --- M include/osmo-bts/bts.h M src/common/bts.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index da321b0..7d3f8bf 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -319,7 +319,7 @@ #define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num); -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); +struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num); int bts_init(struct gsm_bts *bts); void bts_shutdown(struct gsm_bts *bts, const char *reason); diff --git a/src/common/bts.c b/src/common/bts.c index 983f61d..c900428 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -255,7 +255,7 @@ return bts; } -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num) +struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num) { struct gsm_bts *bts; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I378fea4aefb2cc4253cdd99ebc9c4f01b21faf95 Gerrit-Change-Number: 20286 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:35:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:35:33 +0000 Subject: Change in osmo-bts[master]: vty: cosmetic: use osmo_talloc_replace_string() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20287 ) Change subject: vty: cosmetic: use osmo_talloc_replace_string() ...................................................................... vty: cosmetic: use osmo_talloc_replace_string() Change-Id: Ic195cef2aafec55d37152045f7714335ded0a62b --- M src/common/vty.c 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index 36b0eaf..dd83a11 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -637,13 +637,9 @@ { struct gsm_bts *bts = vty->index; - if (bts->pcu.sock_path) { - /* FIXME: close the interface? */ - talloc_free(bts->pcu.sock_path); - } - bts->pcu.sock_path = talloc_strdup(bts, argv[0]); - /* FIXME: re-open the interface? */ + osmo_talloc_replace_string(bts, &bts->pcu.sock_path, argv[0]); + /* FIXME: re-open the interface? */ return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic195cef2aafec55d37152045f7714335ded0a62b Gerrit-Change-Number: 20287 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:35:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:35:34 +0000 Subject: Change in osmo-bts[master]: tx_power: make trx/lchan struct pointers const where possible In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20307 ) Change subject: tx_power: make trx/lchan struct pointers const where possible ...................................................................... tx_power: make trx/lchan struct pointers const where possible Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 --- M include/osmo-bts/tx_power.h M src/common/tx_power.c 2 files changed, 28 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/tx_power.h b/include/osmo-bts/tx_power.h index 4d0457b..8f68d8a 100644 --- a/include/osmo-bts/tx_power.h +++ b/include/osmo-bts/tx_power.h @@ -62,23 +62,23 @@ } ramp; }; -int get_p_max_out_mdBm(struct gsm_bts_trx *trx); +int get_p_max_out_mdBm(const struct gsm_bts_trx *trx); -int get_p_nominal_mdBm(struct gsm_bts_trx *trx); +int get_p_nominal_mdBm(const struct gsm_bts_trx *trx); -int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_target_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan); -int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm); +int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm); -int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan); -int get_p_trxout_actual_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_trxout_actual_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_trxout_actual_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan); int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb); void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm); -int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx); +int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx); diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 08c4236..0741429 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -43,16 +43,16 @@ } /* maximum output power of the system */ -int get_p_max_out_mdBm(struct gsm_bts_trx *trx) +int get_p_max_out_mdBm(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* Add user gain, internal and external PA gain to TRX output power */ return tpp->trx_p_max_out_mdBm + tpp->user_gain_mdB + tpp->pa.nominal_gain_mdB + tpp->user_pa.nominal_gain_mdB; } /* nominal output power, i.e. OML-reduced maximum output power */ -int get_p_nominal_mdBm(struct gsm_bts_trx *trx) +int get_p_nominal_mdBm(const struct gsm_bts_trx *trx) { /* P_max_out subtracted by OML maximum power reduction IE */ return get_p_max_out_mdBm(trx) - to_mdB(trx->max_power_red); @@ -61,21 +61,21 @@ /* calculate the target total output power required, reduced by both * OML and RSL, but ignoring the attenuation required for power ramping and * thermal management */ -int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red) +int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red) { /* Pn subtracted by RSL BS Power Recudtion (in 1 dB steps) */ return get_p_nominal_mdBm(trx) - to_mdB(bs_power_red); } -int get_p_target_mdBm_lchan(struct gsm_lchan *lchan) +int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan) { return get_p_target_mdBm(lchan->ts->trx, lchan->bs_power_red); } /* calculate the actual total output power required, taking into account the * attenuation required for power ramping but not thermal management */ -int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* P_target subtracted by ramp attenuation */ return p_target_mdBm - tpp->ramp.attenuation_mdB; @@ -83,9 +83,9 @@ /* calculate the effective total output power required, taking into account the * attenuation required for power ramping and thermal management */ -int get_p_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* P_target subtracted by ramp attenuation */ return p_target_mdBm - tpp->ramp.attenuation_mdB - tpp->thermal_attenuation_mdB; @@ -93,9 +93,9 @@ /* calculate effect TRX output power required, taking into account the * attenuations required for power ramping and thermal management */ -int get_p_trxout_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_trxout_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int p_actual_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm; unsigned int arfcn = trx->arfcn; @@ -114,9 +114,9 @@ /* calculate target TRX output power required, ignoring the * attenuations required for power ramping but not thermal management */ -int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red) +int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int p_target_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm; unsigned int arfcn = trx->arfcn; @@ -132,7 +132,7 @@ /* internal PA input drive level is TRX output power */ return pa_drvlvl_mdBm; } -int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan) +int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan) { return get_p_trxout_target_mdBm(lchan->ts->trx, lchan->bs_power_red); } @@ -147,9 +147,9 @@ * attempting to register at the same time. Rather, grow the cell slowly in * radius than start with the full radius at once. */ -static int we_are_ramping_up(struct gsm_bts_trx *trx) +static int we_are_ramping_up(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; if (tpp->p_total_tgt_mdBm > tpp->p_total_cur_mdBm) return 1; @@ -298,9 +298,9 @@ } /* determine the initial transceiver output power at start-up time */ -int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx) +int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int pout_mdBm; /* this is the maximum initial output on the antenna connector -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 Gerrit-Change-Number: 20307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:35:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:35:35 +0000 Subject: Change in osmo-bts[master]: vty: make most struct pointers const in show/write commands In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20288 ) Change subject: vty: make most struct pointers const in show/write commands ...................................................................... vty: make most struct pointers const in show/write commands Change-Id: Iacc32f7982c150d84ea4df7affa1f9e07806928f --- M include/osmo-bts/bts.h M include/osmo-bts/bts_model.h M include/osmo-bts/phy_link.h M src/common/l1sap.c M src/common/phy_link.c M src/common/vty.c M src/osmo-bts-litecell15/lc15bts_vty.c M src/osmo-bts-oc2g/oc2gbts_vty.c M src/osmo-bts-octphy/octphy_vty.c M src/osmo-bts-sysmo/sysmobts_vty.c M src/osmo-bts-trx/trx_vty.c M src/osmo-bts-virtual/virtualbts_vty.c 12 files changed, 77 insertions(+), 77 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 7d3f8bf..ffaeb57 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -347,7 +347,7 @@ int bts_supports_cm(struct gsm_bts *bts, enum gsm_phys_chan_config pchan, enum gsm48_chan_mode cm); -int32_t bts_get_avg_fn_advance(struct gsm_bts *bts); +int32_t bts_get_avg_fn_advance(const struct gsm_bts *bts); /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h index 4fd0813..568ff00 100644 --- a/include/osmo-bts/bts_model.h +++ b/include/osmo-bts/bts_model.h @@ -36,10 +36,10 @@ int bts_model_vty_init(struct gsm_bts *bts); -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts); -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx); -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink); -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst); +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts); +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx); +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink); +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst); int bts_model_oml_estab(struct gsm_bts *bts); diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index ce4ea45..ef3df27 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -164,7 +164,7 @@ const char *phy_link_state_name(enum phy_link_state state); int phy_links_open(void); -struct phy_instance *phy_instance_by_num(struct phy_link *plink, int num); +struct phy_instance *phy_instance_by_num(const struct phy_link *plink, int num); struct phy_instance *phy_instance_create(struct phy_link *plink, int num); void phy_instance_link_to_trx(struct phy_instance *pinst, struct gsm_bts_trx *trx); void phy_instance_destroy(struct phy_instance *pinst); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index eac5000..ca1949a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -882,7 +882,7 @@ } /* return the measured average of frame numbers that the RTS clock is running in advance */ -int32_t bts_get_avg_fn_advance(struct gsm_bts *bts) +int32_t bts_get_avg_fn_advance(const struct gsm_bts *bts) { if (bts->fn_stats.avg_count == 0) return 0; diff --git a/src/common/phy_link.c b/src/common/phy_link.c index d13d3f1..48ba283 100644 --- a/src/common/phy_link.c +++ b/src/common/phy_link.c @@ -79,7 +79,7 @@ return get_value_string(phy_link_state_vals, state); } -struct phy_instance *phy_instance_by_num(struct phy_link *plink, int num) +struct phy_instance *phy_instance_by_num(const struct phy_link *plink, int num) { struct phy_instance *pinst; diff --git a/src/common/vty.c b/src/common/vty.c index dd83a11..b662320 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -216,9 +216,9 @@ return CMD_SUCCESS; } -static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) +static void config_write_bts_single(struct vty *vty, const struct gsm_bts *bts) { - struct gsm_bts_trx *trx; + const struct gsm_bts_trx *trx; const char *sapi_buf; int i; @@ -281,8 +281,8 @@ bts_model_config_write_bts(vty, bts); llist_for_each_entry(trx, &bts->trx_list, list) { - struct trx_power_params *tpp = &trx->power_params; - struct phy_instance *pinst = trx_phy_instance(trx); + const struct trx_power_params *tpp = &trx->power_params; + const struct phy_instance *pinst = trx_phy_instance(trx); vty_out(vty, " trx %u%s", trx->nr, VTY_NEWLINE); if (trx->power_params.user_gain_mdB) @@ -307,7 +307,7 @@ static int config_write_bts(struct vty *vty) { struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts; + const struct gsm_bts *bts; llist_for_each_entry(bts, &net->bts_list, list) config_write_bts_single(vty, bts); @@ -315,7 +315,7 @@ return CMD_SUCCESS; } -static void config_write_phy_single(struct vty *vty, struct phy_link *plink) +static void config_write_phy_single(struct vty *vty, const struct phy_link *plink) { int i; @@ -323,7 +323,7 @@ bts_model_config_write_phy(vty, plink); for (i = 0; i < 255; i++) { - struct phy_instance *pinst = phy_instance_by_num(plink, i); + const struct phy_instance *pinst = phy_instance_by_num(plink, i); if (!pinst) break; vty_out(vty, " instance %u%s", pinst->num, VTY_NEWLINE); @@ -336,7 +336,7 @@ int i; for (i = 0; i < 255; i++) { - struct phy_link *plink = phy_link_by_num(i); + const struct phy_link *plink = phy_link_by_num(i); if (!plink) break; config_write_phy_single(vty, plink); @@ -815,7 +815,7 @@ * SHOW * ======================================================================*/ -static void net_dump_nmstate(struct vty *vty, struct gsm_nm_state *nms) +static void net_dump_nmstate(struct vty *vty, const struct gsm_nm_state *nms) { vty_out(vty,"Oper '%s', Admin '%s', Avail '%s'%s", abis_nm_opstate_name(nms->operational), @@ -823,7 +823,7 @@ abis_nm_avail_name(nms->availability), VTY_NEWLINE); } -static void bts_dump_vty_features(struct vty *vty, struct gsm_bts *bts) +static void bts_dump_vty_features(struct vty *vty, const struct gsm_bts *bts) { unsigned int i; bool no_features; @@ -855,9 +855,9 @@ vty_out(vty, " (not available)%s", VTY_NEWLINE); } -static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts) +static void bts_dump_vty(struct vty *vty, const struct gsm_bts *bts) { - struct gsm_bts_trx *trx; + const struct gsm_bts_trx *trx; vty_out(vty, "BTS %u is of %s type in band %s, has CI %u LAC %u, " "BSIC %u and %u TRX%s", @@ -904,7 +904,7 @@ bts_get_avg_fn_advance(bts), bts->fn_stats.min, bts->fn_stats.max, VTY_NEWLINE); llist_for_each_entry(trx, &bts->trx_list, list) { - struct phy_instance *pinst = trx_phy_instance(trx); + const struct phy_instance *pinst = trx_phy_instance(trx); vty_out(vty, " TRX %u%s", trx->nr, VTY_NEWLINE); if (pinst) { vty_out(vty, " phy %d %s", pinst->num, pinst->version); @@ -923,7 +923,7 @@ SHOW_STR "Display information about a BTS\n" BTS_NR_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_network *net = gsmnet_from_vty(vty); int bts_nr; if (argc != 0) { @@ -948,9 +948,9 @@ "Various testing commands\n" "Send a test OML failure event report to the BSC\n" BTS_NR_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_network *net = gsmnet_from_vty(vty); int bts_nr = atoi(argv[0]); - struct gsm_bts *bts; + const struct gsm_bts *bts; if (bts_nr >= net->num_bts) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); @@ -963,7 +963,7 @@ return CMD_SUCCESS; } -static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx) +static void trx_dump_vty(struct vty *vty, const struct gsm_bts_trx *trx) { vty_out(vty, "TRX %u of BTS %u is on ARFCN %u%s", trx->nr, trx->bts->nr, trx->arfcn, VTY_NEWLINE); @@ -994,8 +994,8 @@ SHOW_STR "Display information about a TRX\n" BTS_TRX_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts = NULL; + const struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_bts *bts = NULL; int bts_nr, trx_nr; if (argc >= 1) { @@ -1031,7 +1031,7 @@ } -static void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts) +static void ts_dump_vty(struct vty *vty, const struct gsm_bts_trx_ts *ts) { vty_out(vty, "BTS %u, TRX %u, Timeslot %u, phys cfg %s, TSC %u", ts->trx->bts->nr, ts->trx->nr, ts->nr, @@ -1050,10 +1050,10 @@ SHOW_STR "Display information about a TS\n" BTS_TRX_TS_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts = NULL; - struct gsm_bts_trx *trx = NULL; - struct gsm_bts_trx_ts *ts = NULL; + const struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_bts *bts = NULL; + const struct gsm_bts_trx *trx = NULL; + const struct gsm_bts_trx_ts *ts = NULL; int bts_nr, trx_nr, ts_nr; if (argc >= 1) { @@ -1122,7 +1122,7 @@ /* call vty_out() to print a string like " as TCH/H" for dynamic timeslots. * Don't do anything if the ts is not dynamic. */ -static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts) +static void vty_out_dyn_ts_status(struct vty *vty, const struct gsm_bts_trx_ts *ts) { switch (ts->pchan) { case GSM_PCHAN_TCH_F_TCH_H_PDCH: @@ -1152,7 +1152,7 @@ } } -static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan) +static void lchan_dump_full_vty(struct vty *vty, const struct gsm_lchan *lchan) { struct in_addr ia; @@ -1228,7 +1228,7 @@ /* TODO: MS Power Control */ } -static void lchan_dump_short_vty(struct vty *vty, struct gsm_lchan *lchan) +static void lchan_dump_short_vty(struct vty *vty, const struct gsm_lchan *lchan) { const struct gsm_meas_rep_unidir *mru = &lchan->meas.ul_res; @@ -1244,12 +1244,12 @@ VTY_NEWLINE); } -static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) +static int dump_lchan_trx_ts(const struct gsm_bts_trx_ts *ts, struct vty *vty, + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { int lchan_nr; for (lchan_nr = 0; lchan_nr < TS_MAX_LCHAN; lchan_nr++) { - struct gsm_lchan *lchan = &ts->lchan[lchan_nr]; + const struct gsm_lchan *lchan = &ts->lchan[lchan_nr]; if (lchan->state == LCHAN_S_NONE) continue; dump_cb(vty, lchan); @@ -1258,26 +1258,26 @@ return CMD_SUCCESS; } -static int dump_lchan_trx(struct gsm_bts_trx *trx, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) +static int dump_lchan_trx(const struct gsm_bts_trx *trx, struct vty *vty, + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { int ts_nr; for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { - struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; + const struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; dump_lchan_trx_ts(ts, vty, dump_cb); } return CMD_SUCCESS; } -static int dump_lchan_bts(struct gsm_bts *bts, struct vty *vty, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) +static int dump_lchan_bts(const struct gsm_bts *bts, struct vty *vty, + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { int trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { - struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); + const struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr); dump_lchan_trx(trx, vty, dump_cb); } @@ -1285,13 +1285,13 @@ } static int lchan_summary(struct vty *vty, int argc, const char **argv, - void (*dump_cb)(struct vty *, struct gsm_lchan *)) + void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts; - struct gsm_bts_trx *trx; - struct gsm_bts_trx_ts *ts; - struct gsm_lchan *lchan; + const struct gsm_network *net = gsmnet_from_vty(vty); + const struct gsm_bts *bts; + const struct gsm_bts_trx *trx; + const struct gsm_bts_trx_ts *ts; + const struct gsm_lchan *lchan; int bts_nr, trx_nr, ts_nr, lchan_nr; if (argc >= 1) { @@ -1370,8 +1370,8 @@ return lchan_summary(vty, argc, argv, lchan_dump_short_vty); } -static struct gsm_lchan *resolve_lchan(struct gsm_network *net, - const char **argv, int idx) +static struct gsm_lchan *resolve_lchan(const struct gsm_network *net, + const char **argv, int idx) { int bts_nr = atoi(argv[idx+0]); int trx_nr = atoi(argv[idx+1]); diff --git a/src/osmo-bts-litecell15/lc15bts_vty.c b/src/osmo-bts-litecell15/lc15bts_vty.c index 2cc812c..5308d1a 100644 --- a/src/osmo-bts-litecell15/lc15bts_vty.c +++ b/src/osmo-bts-litecell15/lc15bts_vty.c @@ -505,9 +505,9 @@ return CMD_SUCCESS; } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { - struct bts_lc15_priv *bts_lc15 = bts->model_priv; + const struct bts_lc15_priv *bts_lc15 = bts->model_priv; vty_out(vty, " led-control-mode %s%s", get_value_string(lc15_led_mode_strs, bts_lc15->led_ctrl_mode), VTY_NEWLINE); @@ -516,16 +516,16 @@ } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { vty_out(vty, " nominal-tx-power %d%s", trx->nominal_power,VTY_NEWLINE); } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { int i; diff --git a/src/osmo-bts-oc2g/oc2gbts_vty.c b/src/osmo-bts-oc2g/oc2gbts_vty.c index 8dc4efa..c12d0bf 100644 --- a/src/osmo-bts-oc2g/oc2gbts_vty.c +++ b/src/osmo-bts-oc2g/oc2gbts_vty.c @@ -541,7 +541,7 @@ } */ -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { /* TODO(oramadan) MERGE struct gsm_bts_role_bts *btsb = bts_role_bts(bts); @@ -555,16 +555,16 @@ } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { vty_out(vty, " nominal-tx-power %d%s", trx->nominal_power,VTY_NEWLINE); } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { int i; diff --git a/src/osmo-bts-octphy/octphy_vty.c b/src/osmo-bts-octphy/octphy_vty.c index afc2ce7..8b263fd 100644 --- a/src/osmo-bts-octphy/octphy_vty.c +++ b/src/osmo-bts-octphy/octphy_vty.c @@ -360,7 +360,7 @@ return CMD_SUCCESS; } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { if (plink->u.octphy.netdev_name) vty_out(vty, " octphy net-device %s%s", @@ -399,15 +399,15 @@ #endif } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { } diff --git a/src/osmo-bts-sysmo/sysmobts_vty.c b/src/osmo-bts-sysmo/sysmobts_vty.c index 7876612..b613031 100644 --- a/src/osmo-bts-sysmo/sysmobts_vty.c +++ b/src/osmo-bts-sysmo/sysmobts_vty.c @@ -433,22 +433,22 @@ } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { if (trx->nominal_power != get_p_max_out_mdBm(trx)) vty_out(vty, " nominal-tx-power %d%s", trx->nominal_power, VTY_NEWLINE); } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { int i; diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 6b8ca77..e5199ec 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -514,7 +514,7 @@ return CMD_SUCCESS; } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { if (plink->u.osmotrx.local_ip) vty_out(vty, " osmotrx ip local %s%s", @@ -542,7 +542,7 @@ vty_out(vty, " osmotrx trxd-max-version %d%s", plink->u.osmotrx.trxd_hdr_ver_max, VTY_NEWLINE); } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -571,11 +571,11 @@ VTY_NEWLINE); } -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; diff --git a/src/osmo-bts-virtual/virtualbts_vty.c b/src/osmo-bts-virtual/virtualbts_vty.c index 875e682..9d63242 100644 --- a/src/osmo-bts-virtual/virtualbts_vty.c +++ b/src/osmo-bts-virtual/virtualbts_vty.c @@ -52,19 +52,19 @@ static struct gsm_bts *vty_bts; -void bts_model_config_write_bts(struct vty *vty, struct gsm_bts *bts) +void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts) { } -void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) +void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx *trx) { } -void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst) +void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst) { } -void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink) +void bts_model_config_write_phy(struct vty *vty, const struct phy_link *plink) { if (plink->u.virt.mcast_dev) vty_out(vty, " virtual-um net-device %s%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iacc32f7982c150d84ea4df7affa1f9e07806928f Gerrit-Change-Number: 20288 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:36:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:36:23 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20250 ) Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 07:36:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:37:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:37:28 +0000 Subject: Change in libosmocore[master]: logging: Introduce MAX_LOG_SIZE for the magic number 4096 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20304 ) Change subject: logging: Introduce MAX_LOG_SIZE for the magic number 4096 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 Gerrit-Change-Number: 20304 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:37:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:37:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:37:31 +0000 Subject: Change in libosmocore[master]: logging: Introduce MAX_LOG_SIZE for the magic number 4096 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20304 ) Change subject: logging: Introduce MAX_LOG_SIZE for the magic number 4096 ...................................................................... logging: Introduce MAX_LOG_SIZE for the magic number 4096 Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 --- M src/logging.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/logging.c b/src/logging.c index 212b0b9..d60d6e4 100644 --- a/src/logging.c +++ b/src/logging.c @@ -56,6 +56,9 @@ #include /* for LOGGING_STR. */ +/* maximum length of the log string of a single log event (typically line) */ +#define MAX_LOG_SIZE 4096 + osmo_static_assert(_LOG_CTX_COUNT <= ARRAY_SIZE(((struct log_context*)NULL)->ctx), enum_logging_ctx_items_fit_in_struct_log_context); osmo_static_assert(_LOG_FLT_COUNT <= ARRAY_SIZE(((struct log_target*)NULL)->filter_data), @@ -390,7 +393,7 @@ unsigned int level, const char *file, int line, int cont, const char *format, va_list ap) { - char buf[4096]; + char buf[MAX_LOG_SIZE]; int ret, len = 0, offset = 0, rem = sizeof(buf); const char *c_subsys = NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9645098dffecd29242857de8f1aea6b9aca5918 Gerrit-Change-Number: 20304 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:39:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:39:35 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#8). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/select.c 3 files changed, 216 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:39:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:39:35 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20305 to look at the new patch set (#4). Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... logging: Avoid memcpy from stack to msgb in _file_output() For file and stderr output, the existing code always generates the log string on a stack buffer, and then (in case of non-blocking write via write_queue) copies it over to a msgb. Let's optimize this by turning _file_output() into a raw_output callback which first allocates the msgb and then format-prints directly to that msgb instaed of stack + memcpy. This has the disadvantage that we don't know how long the buffer has to be in order to print the entire string to it. As a result we always have to allocate a 4k-sized buffer (plus msgb overhead). The write_queue length for log file output has been decreased from 1024 entries to 156 entries in order to stay within the same memory requirements for each log target memory pool (about 648 kBytes). Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 --- M src/logging.c 1 file changed, 43 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/20305/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:39:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:39:35 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20317 to look at the new patch set (#2). Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... logging: Attempt a synchronous, non-blocking write first (file, stderr) In the old days, we performed synchronous, blocking writes to the log file or stderr. This was replaced by code that turned all log file/stderr writes into non-blocking writes behind a write_queue. This patch now introduces a further optimization: If we currently don't have any log messages pending in the write queue, we are not back-logged and assume we have a fair chance of writing the log message right now, synchronously. So we try that first, and only enqueue the log message if the write fails (no bytes or insufficient number of bytes written). This way we should get the best of both worlds: No delay/re-ordering (and lower select syscall load) for the "normal" case (benefits of the old synchronous writes) while at the same time never risking to block on log output. Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 --- M src/logging.c 1 file changed, 30 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/20317/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:41:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:41:59 +0000 Subject: Change in osmo-bts[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20318 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcdfcd157e5067fa2e4296d7c7e93a74087f49ff Gerrit-Change-Number: 20318 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:41:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:43:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:43:14 +0000 Subject: Change in osmo-trx[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20319 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6dfdedc081eb8c3d53913f6fa38591920c8b3b43 Gerrit-Change-Number: 20319 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 07:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:45:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:45:45 +0000 Subject: Change in osmo-pcu[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20320 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20320/1/src/pcu_vty.c File src/pcu_vty.c: https://gerrit.osmocom.org/c/osmo-pcu/+/20320/1/src/pcu_vty.c at 1255 PS1, Line 1255: reconnects I think we need to be more specific here. what is a 'ns reconnect'? Given that NS works over datagram oriented transports, does "reconnect" mean a NS-RESET/NS-UNBLOCK procedure? and what if IP-SNS is used, where there are no such procedures? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I63978ce3ea87593c9a41e503ed3b761c64e1e80f Gerrit-Change-Number: 20320 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 07:45:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:51:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:51:27 +0000 Subject: Change in osmo-bsc[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19670 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 8: (2 comments) We are missing an update to the user manual, too. https://gerrit.osmocom.org/c/osmo-bsc/+/19670/8/src/osmo-bsc/abis_om2000_vty.c File src/osmo-bsc/abis_om2000_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19670/8/src/osmo-bsc/abis_om2000_vty.c at 91 PS8, Line 91: "BTS Number\n" "Associated SO Instance\n" "Instance Number\n", pretty much all of the commands here are not configuration commands. they are installed in the OM2K_NODE hierarchy, which is below the "ENABLE" node. Those are like "show subscriber" or "drop BTS oml link" which are always imperative, immediate commands as they are outside the "confiugure terminal" node. I think we only should add attributes to commands that are below the "configure terminal" node. https://gerrit.osmocom.org/c/osmo-bsc/+/19670/8/src/osmo-bsc/abis_om2000_vty.c at 278 PS8, Line 278: CMD_ATTR_IMMEDIATE I think all the commands from top to here are not part of the "configure" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51 Gerrit-Change-Number: 19670 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:51:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:52:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:52:10 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: add user attributes to configuration commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20250 ) Change subject: mgcp_vty: add user attributes to configuration commands ...................................................................... Patch Set 5: -Code-Review We are missing an update to the user manual, explaining the different attributes. I think there should be a common part linked in from osmo-gsm-manuals.git for the general attributes, plus the application-specific attributes documented here. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 Gerrit-Change-Number: 20250 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 07:52:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:52:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:52:33 +0000 Subject: Change in osmo-pcu[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20320 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 1: We are missing an update to the user manual, explaining the different attributes. I think there should be a common part linked in from osmo-gsm-manuals.git for the general attributes, plus the application-specific attributes documented here. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I63978ce3ea87593c9a41e503ed3b761c64e1e80f Gerrit-Change-Number: 20320 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 07:52:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:52:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:52:39 +0000 Subject: Change in osmo-trx[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20319 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 1: -Code-Review We are missing an update to the user manual, explaining the different attributes. I think there should be a common part linked in from osmo-gsm-manuals.git for the general attributes, plus the application-specific attributes documented here. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6dfdedc081eb8c3d53913f6fa38591920c8b3b43 Gerrit-Change-Number: 20319 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 07:52:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 07:52:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 07:52:59 +0000 Subject: Change in osmo-bts[master]: vty: add attributes to VTY commands indicating when they apply In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20318 ) Change subject: vty: add attributes to VTY commands indicating when they apply ...................................................................... Patch Set 1: -Code-Review We are missing an update to the user manual, explaining the different attributes. I think there should be a common part linked in from osmo-gsm-manuals.git for the general attributes, plus the application-specific attributes documented here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifcdfcd157e5067fa2e4296d7c7e93a74087f49ff Gerrit-Change-Number: 20318 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 07:52:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 10:46:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 30 Sep 2020 10:46:39 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Log Rx Change Administrative State ACK References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20321 ) Change subject: abis_nm: Log Rx Change Administrative State ACK ...................................................................... abis_nm: Log Rx Change Administrative State ACK Change-Id: I165138634b1fdb982197afdac6d2d00a4d1e4074 --- M src/osmo-bsc/abis_nm.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/20321/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 4691137..9213aaa 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -759,6 +759,9 @@ adm_state = *TLVP_VAL(&tp, NM_ATT_ADM_STATE); + DEBUGPFOH(DNM, foh, "Rx Change Administrative State ACK %s\n", + get_value_string(abis_nm_adm_state_names, adm_state)); + return update_admstate(sign_link->trx->bts, foh->obj_class, &foh->obj_inst, adm_state); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I165138634b1fdb982197afdac6d2d00a4d1e4074 Gerrit-Change-Number: 20321 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 10:46:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 30 Sep 2020 10:46:40 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Log no state change detected References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20322 ) Change subject: abis_nm: Log no state change detected ...................................................................... abis_nm: Log no state change detected Change-Id: I15695b18ad7b31c2f9579813b76ecee36cce4ede --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/20322/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 9213aaa..0c050e9 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -293,6 +293,8 @@ nm_state->availability = new_state.availability; if (nm_state->administrative == 0) nm_state->administrative = new_state.administrative; + } else { + DEBUGPFOH(DNM, foh, "No State change detected\n"); } #if 0 if (op_state == 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I15695b18ad7b31c2f9579813b76ecee36cce4ede Gerrit-Change-Number: 20322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 10:59:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 30 Sep 2020 10:59:34 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Remove duplicated log line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20323 ) Change subject: abis_nm: Remove duplicated log line ...................................................................... abis_nm: Remove duplicated log line Change-Id: I52ff3c7457ca9985bb4936a6ec48abe0aee07e71 --- M src/osmo-bsc/abis_nm.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/20323/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 0c050e9..7cd50ed 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -953,7 +953,6 @@ DEBUGPFOH(DNM, foh, "Set Channel Attributes ACK\n"); break; case NM_MT_SET_RADIO_ATTR_ACK: - DEBUGPFOH(DNM, foh, "Set Radio Carrier Attributes ACK\n"); abis_nm_rx_set_radio_attr_ack(mb); break; case NM_MT_CONN_MDROP_LINK_ACK: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I52ff3c7457ca9985bb4936a6ec48abe0aee07e71 Gerrit-Change-Number: 20323 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 10:59:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 30 Sep 2020 10:59:37 +0000 Subject: Change in osmo-bsc[master]: ipa oml: tx OPSTART after unlocking, not before References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20324 ) Change subject: ipa oml: tx OPSTART after unlocking, not before ...................................................................... ipa oml: tx OPSTART after unlocking, not before According to TS 12.21, when adminsitratively Locking an object, in general it should go into operative state Disabled. We don't really implement it this way right now, but keep it this way consistent in all objects. Furthermore, TS 12.21. Figure 2 describes vaguely that unlock procedure is done around same time where object attributes are set, which is before OPSTART. Change-Id: Icd4b3bb467f23c9ddfa56f6b6f8a55da1e574ab8 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/20324/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 796d208..e02eabc 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -211,12 +211,12 @@ 0, 0xff, msgb->data, msgb->len); msgb_free(msgb); - abis_nm_opstart(bts, obj_class, bts->bts_nr, - 0, 0xff); abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr, 0, 0xff, NM_STATE_UNLOCKED); abis_nm_chg_adm_state(bts, NM_OC_GPRS_NSE, bts->bts_nr, 0xff, 0xff, NM_STATE_UNLOCKED); + abis_nm_opstart(bts, obj_class, bts->bts_nr, + 0, 0xff); } break; case NM_OC_GPRS_NSVC: @@ -234,11 +234,11 @@ nsvc->id, 0xff, msgb->data, msgb->len); msgb_free(msgb); - abis_nm_opstart(bts, obj_class, bts->bts_nr, - nsvc->id, 0xff); abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr, nsvc->id, 0xff, NM_STATE_UNLOCKED); + abis_nm_opstart(bts, obj_class, bts->bts_nr, + nsvc->id, 0xff); } default: break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd4b3bb467f23c9ddfa56f6b6f8a55da1e574ab8 Gerrit-Change-Number: 20324 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:51:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:51:11 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Log Rx Change Administrative State ACK In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20321 ) Change subject: abis_nm: Log Rx Change Administrative State ACK ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I165138634b1fdb982197afdac6d2d00a4d1e4074 Gerrit-Change-Number: 20321 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:51:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:52:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:52:49 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Log no state change detected In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20322 ) Change subject: abis_nm: Log no state change detected ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/20322/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/20322/1/src/osmo-bsc/abis_nm.c at 297 PS1, Line 297: DEB Why not change this to DEBUGPC(DNM, ": No state change detected\n") and move the DEBUGPC(DNM, "\n") above into the "if" clause above. This way we always have one line about the state change, either with the suffix (no state change) or without the suffix (actual state change). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I15695b18ad7b31c2f9579813b76ecee36cce4ede Gerrit-Change-Number: 20322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:52:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:53:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:53:01 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Remove duplicated log line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20323 ) Change subject: abis_nm: Remove duplicated log line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I52ff3c7457ca9985bb4936a6ec48abe0aee07e71 Gerrit-Change-Number: 20323 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:53:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:53:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:53:38 +0000 Subject: Change in osmo-bsc[master]: ipa oml: tx OPSTART after unlocking, not before In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20324 ) Change subject: ipa oml: tx OPSTART after unlocking, not before ...................................................................... Patch Set 1: has this been tested with both nanoBTS and osmo-bts? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd4b3bb467f23c9ddfa56f6b6f8a55da1e574ab8 Gerrit-Change-Number: 20324 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:53:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:53:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:53:48 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Log Rx Change Administrative State ACK In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20321 ) Change subject: abis_nm: Log Rx Change Administrative State ACK ...................................................................... abis_nm: Log Rx Change Administrative State ACK Change-Id: I165138634b1fdb982197afdac6d2d00a4d1e4074 --- M src/osmo-bsc/abis_nm.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 4691137..9213aaa 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -759,6 +759,9 @@ adm_state = *TLVP_VAL(&tp, NM_ATT_ADM_STATE); + DEBUGPFOH(DNM, foh, "Rx Change Administrative State ACK %s\n", + get_value_string(abis_nm_adm_state_names, adm_state)); + return update_admstate(sign_link->trx->bts, foh->obj_class, &foh->obj_inst, adm_state); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I165138634b1fdb982197afdac6d2d00a4d1e4074 Gerrit-Change-Number: 20321 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:54:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:54:31 +0000 Subject: Change in libosmocore[master]: logging: Add 'length' argument to target->output() function In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20303 ) Change subject: logging: Add 'length' argument to target->output() function ...................................................................... Abandoned this is no longer required. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a92239831fe3d8a49a31b59073f7eb2e7e70ce6 Gerrit-Change-Number: 20303 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:54:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:54:57 +0000 Subject: Change in pysim[master]: Move programminig of ePDG Id to generic USIM class In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20312 ) Change subject: Move programminig of ePDG Id to generic USIM class ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I198d2d3303343b24ec92ba73cce21257213f6f89 Gerrit-Change-Number: 20312 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:54:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:57:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:57:35 +0000 Subject: Change in pysim[master]: Surround by try except to continue programming of other parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20313 ) Change subject: Surround by try except to continue programming of other parameters ...................................................................... Patch Set 1: I think the problem with this is that the exit() code of the program now is always "success" (0) even if there were any errors. This is very dangerous if you use some scripts to determine success/failure of the programming operation. If we go your approach, then we need to make sure that if any exceptions were raised, we need to memorize that and terminate the program with an error exit code. Also, any error messages should always be printed to stderr, not to stdout (which you are doing here). Either change to stderr, or maybe consider introducing the general python logging framework here, which should hopefully make sure error-level messages are actually printed to stderr. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5a200e0594dc29cb6fdaf8966f4a11adeddcd80f Gerrit-Change-Number: 20313 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:57:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:58:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:58:09 +0000 Subject: Change in pysim[master]: Move reading of ePDG Id to generic USIM class In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20314 ) Change subject: Move reading of ePDG Id to generic USIM class ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I716acb994430db3d4e56fea072f8dc2cebeaba84 Gerrit-Change-Number: 20314 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:58:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:58:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:58:45 +0000 Subject: Change in pysim[master]: Move reading of USIM service table to generic USIM class In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/20315 ) Change subject: Move reading of USIM service table to generic USIM class ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/20315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I537547f3bd01a547310358f8a8fceddcb4c79f37 Gerrit-Change-Number: 20315 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 11:58:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:59:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:59:17 +0000 Subject: Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Wed, 30 Sep 2020 11:59:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 11:59:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 11:59:28 +0000 Subject: Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG ...................................................................... gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG The NM_ATT_OSMO_NS_LINK_CFG is used for NSVC configuration of osmocom based BTS to support IPv6 NSVCs. Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f --- M include/osmocom/gsm/protocol/gsm_12_21.h 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve roh: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h index 06755c9..34622b3 100644 --- a/include/osmocom/gsm/protocol/gsm_12_21.h +++ b/include/osmocom/gsm/protocol/gsm_12_21.h @@ -789,6 +789,13 @@ IPAC_BINF_CELL_ALLOC = (1 << 2), }; +/*! Osmocom NSVC address type for NM_ATT_OSMO_NS_LINK_CFG */ +enum osmo_oml_nsvc_address_type { + OSMO_NSVC_ADDR_UNSPEC = 0x00, + OSMO_NSVC_ADDR_IPV4 = 0x04, + OSMO_NSVC_ADDR_IPV6 = 0x29, +}; + /*! 3GPP TS 52.021 ?9.4.62 SW Description */ struct abis_nm_sw_desc { uint8_t file_id[UINT8_MAX]; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 12:01:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 12:01:05 +0000 Subject: Change in osmo-bts[master]: gsm_data.h: Drop unused struct field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20310 ) Change subject: gsm_data.h: Drop unused struct field ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b62c41bcb992df376668c6feb6ac7ada35d471d Gerrit-Change-Number: 20310 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 12:01:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 12:06:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 12:06:53 +0000 Subject: Change in osmo-bts[master]: Introduce NM operative state Radio Carrier FSM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20284 ) Change subject: Introduce NM operative state Radio Carrier FSM ...................................................................... Patch Set 7: (1 comment) I like it, but I also think we need to test this on at least the trx,sysmo,oc2g targets... https://gerrit.osmocom.org/c/osmo-bts/+/20284/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/20284/7//COMMIT_MSG at 21 PS7, Line 21: Related: OS#2469 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifb249a821c4270918699b6375a72b3a618e8cfbe Gerrit-Change-Number: 20284 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 12:06:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 12:08:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 12:08:50 +0000 Subject: Change in osmocom-bb[master]: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20300 ) Change subject: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1a74cdcd03366390e88b2d5bddf01329410b9f1c Gerrit-Change-Number: 20300 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 12:08:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 12:08:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 12:08:52 +0000 Subject: Change in osmocom-bb[master]: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20300 ) Change subject: fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable ...................................................................... fix compilation with arm-none-eabi 8.3.1 20190703 on Debian unstable To make the situation about stdint.h even more complicated, this toolchain doesn't anymore #define __int8_t_defined, which means we again run into conflicting definitions :/ Let's try to use INT8_MAX as a key. Change-Id: I1a74cdcd03366390e88b2d5bddf01329410b9f1c --- M src/target/firmware/include/stdint.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/target/firmware/include/stdint.h b/src/target/firmware/include/stdint.h index 627403f..5997f43 100644 --- a/src/target/firmware/include/stdint.h +++ b/src/target/firmware/include/stdint.h @@ -19,7 +19,7 @@ #include_next #endif -#ifndef __int8_t_defined +#if (!defined(__int8_t_defined) && !defined(INT8_MAX)) typedef signed char int8_t; typedef unsigned char uint8_t; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1a74cdcd03366390e88b2d5bddf01329410b9f1c Gerrit-Change-Number: 20300 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 12:09:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 12:09:39 +0000 Subject: Change in osmocom-bb[master]: Menu App to select highram images from phone's flash memory In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/20298 to look at the new patch set (#2). Change subject: Menu App to select highram images from phone's flash memory ...................................................................... Menu App to select highram images from phone's flash memory Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f --- M src/target/firmware/Makefile A src/target/firmware/apps/menu/main.c 2 files changed, 339 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/98/20298/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f Gerrit-Change-Number: 20298 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 16:35:58 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 30 Sep 2020 16:35:58 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... Patch Set 2: Code-Review+2 add up -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 16:35:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 21:16:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 21:16:04 +0000 Subject: Change in osmocom-bb[master]: Menu App to select highram images from phone's flash memory In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20298 ) Change subject: Menu App to select highram images from phone's flash memory ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f Gerrit-Change-Number: 20298 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 30 Sep 2020 21:16:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 21:16:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 21:16:06 +0000 Subject: Change in osmocom-bb[master]: Menu App to select highram images from phone's flash memory In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20298 ) Change subject: Menu App to select highram images from phone's flash memory ...................................................................... Menu App to select highram images from phone's flash memory Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f --- M src/target/firmware/Makefile A src/target/firmware/apps/menu/main.c 2 files changed, 339 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index f7235ac..28a6418 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -96,11 +96,12 @@ # # List of all applications (meant to be overridden on command line) -APPLICATIONS?=hello_world compal_dsp_dump layer1 loader rssi +APPLICATIONS?=hello_world compal_dsp_dump layer1 loader rssi menu # Applications specific env requirements APP_loader_ENVIRONMENTS=compalram highram APP_rssi_ENVIRONMENTS=* -compalram +APP_menu_ENVIRONMENTS=* -highram # Various objects that are currently linked into all applications FLASH_OBJS=flash/cfi_flash.o diff --git a/src/target/firmware/apps/menu/main.c b/src/target/firmware/apps/menu/main.c new file mode 100644 index 0000000..fa36968 --- /dev/null +++ b/src/target/firmware/apps/menu/main.c @@ -0,0 +1,337 @@ +/* Menu for Calypso Phone to load applicatios from flash */ + +/* (C) 2013 by Andreas Eversberg + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define RAM 0x00820000 +#define MAGIC 0x0083ff00 + +static enum key_codes key_code = KEY_INV; +static volatile enum key_states key_state; + +static int cursor = 0, scroll_apps = 0; + +static struct apps { + char name[16]; + void *start; + int len; +} apps[32]; + +static void locate_apps(void) +{ + int i, j, k; + char *p; + + memset(apps, 0, sizeof(apps)); + + for (j = 0, i = 0x010000; i < 0x200000; i += 0x10000) { + p = (char *)i; + /* check for highram header: "highram:" */ + if (!!memcmp(p, "highram:", 8)) + continue; + p += 8; + /* check for app name after header: "highram:\n" */ + printf("found highram image at flash mem address 0x%p\n", + (char *)i); + for (k = 0; k < (int)sizeof(apps[j].name) - 1; k++) { + if (p[k] == '\n') + break; + } + if (k == sizeof(apps[j].name) - 3) { + printf("skipping: corrupt highram header, no '\\n' " + "after image name or name more larger than %d " + "digits\n", (int)sizeof(apps[j].name) - 3); + continue; + } + if (j < 9) + apps[j].name[0] = '1' + j; + else if (j == 9) + apps[j].name[0] = '0'; + else + apps[j].name[0] = ' '; + apps[j].name[1] = ' '; + memcpy(apps[j].name + 2, p, k); + apps[j].len = 0x20000; + p += k + 1; + /* p points to highram image after header */ + apps[j].start = p; + j++; + } +} + +static void wait_key_release(void) +{ + /* wait for key release */ + while (key_state == PRESSED) { + delay_ms(10); + keypad_poll(); + } +} + +static void load_app(void) +{ + static int i; + static void (*f) (void) = (void (*)(void))RAM; + + wait_key_release(); + + local_irq_disable(); + + for (i = 0; i < apps[cursor].len; i++) + ((unsigned char *)RAM)[i] = ((unsigned char *)apps[cursor].start)[i]; + f(); +} + +/* UI */ + +static void refresh_display(void) +{ +#if 0 + char text[16]; + int bat = battery_info.battery_percent; +#endif + int i; + + fb_clear(); + + /* header */ + fb_setbg(FB_COLOR_WHITE); + if (1) { + fb_setfg(FB_COLOR_BLUE); + fb_setfont(FB_FONT_HELVR08); + fb_gotoxy(0, 7); + fb_putstr("Osmocom Menu", -1); + fb_setfg(FB_COLOR_RGB(0xc0, 0xc0, 0x00)); + fb_setfont(FB_FONT_SYMBOLS); +#if 0 + fb_gotoxy(framebuffer->width - 15, 8); + if (bat >= 100 && (battery_info.flags & BATTERY_CHG_ENABLED) + && !(battery_info.flags & BATTERY_CHARGING)) + fb_putstr("@HHBC", framebuffer->width); + else { + sprintf(text, "@%c%c%cC", (bat >= 30) ? 'B':'A', + (bat >= 60) ? 'B':'A', (bat >= 90) ? 'B':'A'); + fb_putstr(text, framebuffer->width); + } +#endif + fb_gotoxy(0, 8); + fb_putstr("GGEGG", framebuffer->width); + fb_setfg(FB_COLOR_GREEN); + fb_gotoxy(0, 10); + fb_boxto(framebuffer->width - 1, 10); + } + fb_setfg(FB_COLOR_BLACK); + fb_setfont(FB_FONT_C64); + + + for (i = 0; i < 5; i++) { + if (!apps[scroll_apps + i].name) + break; + if (scroll_apps + i == cursor) { + fb_setfg(FB_COLOR_WHITE); + fb_setbg(FB_COLOR_BLUE); + } + fb_gotoxy(0, 20 + i * 10); + fb_putstr(apps[scroll_apps + i].name, + framebuffer->width); + if (scroll_apps + i == cursor) { + fb_setfg(FB_COLOR_BLACK); + fb_setbg(FB_COLOR_WHITE); + } + } + if (i == 0) { + fb_gotoxy(0, 50); + fb_putstr("No apps!", -1); + } + + fb_flush(); +} + +static void handle_key_code() +{ + if (key_code == KEY_INV) + return; + + switch (key_code) { + case KEY_1: + case KEY_2: + case KEY_3: + case KEY_4: + case KEY_5: + case KEY_6: + case KEY_7: + case KEY_8: + case KEY_9: + if (apps[key_code - KEY_1].len) { + cursor = key_code - KEY_1; + load_app(); + } + break; + case KEY_0: + if (apps[9].len) { + cursor = 9; + load_app(); + } + break; + case KEY_UP: + if (cursor == 0) + return; + cursor--; + if (cursor < scroll_apps) + scroll_apps = cursor; + refresh_display(); + break; + case KEY_DOWN: + if (!apps[cursor + 1].name[0]) + return; + cursor++; + if (cursor >= scroll_apps + 5) + scroll_apps = cursor - 4; + refresh_display(); + break; + case KEY_OK: + if (apps[cursor].len) + load_app(); + break; + case KEY_POWER: + wait_key_release(); + twl3025_power_off(); + break; + default: + break; + } + + key_code = KEY_INV; +} + +/* Main Program */ +const char *hr = "======================================================================\n"; + +static void key_handler(enum key_codes code, enum key_states state) +{ + key_state = state; + + if (state != PRESSED) + return; + + key_code = code; +} + +extern void putchar_asm(uint32_t c); + +static const uint8_t phone_ack[] = { 0x1b, 0xf6, 0x02, 0x00, 0x41, 0x03, 0x42 }; + +int main(void) +{ + int i; + + /* Simulate a compal loader saying "ACK" */ + for (i = 0; i < (int)sizeof(phone_ack); i++) { + putchar_asm(phone_ack[i]); + } + + board_init(0); + + puts("\n\nOsmocomBB Menu (revision " GIT_REVISION ")\n"); + puts(hr); + + fb_clear(); + + fb_setfg(FB_COLOR_BLACK); + fb_setbg(FB_COLOR_WHITE); + fb_setfont(FB_FONT_HELVB14); + + fb_gotoxy(2,20); + fb_putstr("menu",framebuffer->width-4); + + fb_setfg(FB_COLOR_RED); + fb_setbg(FB_COLOR_BLUE); + + fb_gotoxy(2,25); + fb_boxto(framebuffer->width-3,38); + + fb_setfg(FB_COLOR_WHITE); + fb_setfont(FB_FONT_HELVR08); + fb_gotoxy(8,33); + fb_putstr("osmocom-bb",framebuffer->width-4); + + fb_flush(); + + /* Dump device identification */ + dump_dev_id(); + puts(hr); + + /* Dump clock config before PLL set */ + calypso_clk_dump(); + puts(hr); + + keypad_set_handler(&key_handler); + + /* Dump clock config after PLL set */ + calypso_clk_dump(); + puts(hr); + +// display_unset_attr(DISP_ATTR_INVERT); + + locate_apps(); + + while (1) { + for (i = 0; i < 50; i++) { + keypad_poll(); + delay_ms(10); + osmo_timers_update(); + handle_key_code(); + } + refresh_display(); + } + + /* NOT REACHED */ + + twl3025_power_off(); +} + -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibbdb0093d8f502dcd57ea92b53e7e56b09ee9e5f Gerrit-Change-Number: 20298 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:39:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:39:26 +0000 Subject: Change in osmocom-bb[master]: firmware: calibration: split afcparams.c from rf_tables.c for gta0x References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20325 ) Change subject: firmware: calibration: split afcparams.c from rf_tables.c for gta0x ...................................................................... firmware: calibration: split afcparams.c from rf_tables.c for gta0x We have new hardware targets that have appeared since the original OS#3582 patch was created, namely Huawei GTM900-B and the upcoming FreeCalypso Caramel2 board. These new targets need the same APC offset as gta0x and fcdev3b (TI's original Leonardo value), they have proper calibration records in their FFS (meaning that all compiled-in numbers become no-effect placeholders), and their PA tracts are similar enough to Openmoko/FCDEV3B to where even in the absence of calibration OM/FC numbers are close enough. Thus most of the tables in board/gta0x/rf_tables.c should be reusable by these new targets. However, these new targets have quite different VCXOs from Openmoko and FCDEV3B, thus they need different AFC parameters. Thus we split board/gta0x/afcparams.c from board/gta0x/rf_tables.c, making the latter more reusable. Related: OS#3582 Change-Id: I92e245843253f279dd6d61bd5098766694c5215f --- M src/target/firmware/Makefile A src/target/firmware/board/gta0x/afcparams.c M src/target/firmware/board/gta0x/rf_tables.c 3 files changed, 55 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/20325/1 diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 6e51107..6eacb33 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -44,6 +44,7 @@ # OpenMoko GTA0x BOARD_gta0x_OBJS=$(calypso_COMMON_OBJS) board/gta0x/init.o \ board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_tables.o \ + board/gta0x/afcparams.o \ board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS) BOARD_gta0x_ENVIRONMENTS=highram @@ -56,6 +57,7 @@ # FreeCalypso FCDEV3B BOARD_fcdev3b_OBJS=$(calypso_COMMON_OBJS) board/fcdev3b/init.o \ board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_tables.o \ + board/gta0x/afcparams.o \ board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS) BOARD_fcdev3b_ENVIRONMENTS=highram diff --git a/src/target/firmware/board/gta0x/afcparams.c b/src/target/firmware/board/gta0x/afcparams.c new file mode 100644 index 0000000..ba48360 --- /dev/null +++ b/src/target/firmware/board/gta0x/afcparams.c @@ -0,0 +1,53 @@ +/* + * This code was written by Mychaela Falconia + * who refuses to claim copyright on it and has released it as public domain + * instead. NO rights reserved, all rights relinquished. + * + * Tweaked (coding style changes) by 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include + +/* + * Here is a typical set of AFC Psi parameters for an FCDEV3B modem board, + * computed by FreeCalypso fc-rfcal-vcxo calibration tool from frequency + * offset measurements made with a CMU200 RF tester: + * + * Psi_sta_inv: 3462 + * Psi_st: 15 + * Psi_st_32: 992326 + * Psi_st_inv: 4328 + * + * The following AFC slope number is the closest OsmocomBB-style afc_slope + * integer corresponding to these Psi numbers; the true value is somewhere + * between 454 and 455. + * + * This AFC slope setting is expected to be correct for both Openmoko and + * FreeCalypso hardware as we use the same VCXO components as were used + * by Openmoko. + */ +int16_t afc_slope = 454; + +/* + * The compiled-in AFC initial DAC value below is the same as was used by + * the old OsmocomBB code written for Mot C1xx phones, but it will normally + * be overridden by the per-unit factory calibration value read from the + * /gsm/rf/afcdac file in FFS. + */ +int16_t afc_initial_dac_value = -700; diff --git a/src/target/firmware/board/gta0x/rf_tables.c b/src/target/firmware/board/gta0x/rf_tables.c index fd33b16..9a08b3c 100644 --- a/src/target/firmware/board/gta0x/rf_tables.c +++ b/src/target/firmware/board/gta0x/rf_tables.c @@ -23,35 +23,6 @@ #include #include -#include - -/* - * Here is a typical set of AFC Psi parameters for an FCDEV3B modem board, - * computed by FreeCalypso fc-rfcal-vcxo calibration tool from frequency - * offset measurements made with a CMU200 RF tester: - * - * Psi_sta_inv: 3462 - * Psi_st: 15 - * Psi_st_32: 992326 - * Psi_st_inv: 4328 - * - * The following AFC slope number is the closest OsmocomBB-style afc_slope - * integer corresponding to these Psi numbers; the true value is somewhere - * between 454 and 455. - * - * This AFC slope setting is expected to be correct for both Openmoko and - * FreeCalypso hardware as we use the same VCXO components as were used - * by Openmoko. - */ -int16_t afc_slope = 454; - -/* - * The compiled-in AFC initial DAC value below is the same as was used by - * the old OsmocomBB code written for Mot C1xx phones, but it will normally - * be overridden by the per-unit factory calibration value read from the - * /gsm/rf/afcdac file in FFS. - */ -int16_t afc_initial_dac_value = -700; /* APC offset (comes from the official firmware) for TI-classic targets */ uint8_t apc_offset = 48; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I92e245843253f279dd6d61bd5098766694c5215f Gerrit-Change-Number: 20325 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:39:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:39:26 +0000 Subject: Change in osmocom-bb[master]: firmware: calibration: proper support for gtm900b target References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20326 ) Change subject: firmware: calibration: proper support for gtm900b target ...................................................................... firmware: calibration: proper support for gtm900b target GTM900-B can share almost all calibration tables with GTA0x and FCDEV3B, only the VCXO is significantly different. Related: OS#3582 Change-Id: I52b63b1d086452139b1efd308d47a4183eace745 --- M src/target/firmware/Makefile A src/target/firmware/board/gtm900b/afcparams.c D src/target/firmware/board/gtm900b/rf_tables.c 3 files changed, 49 insertions(+), 596 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/26/20326/1 diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 6eacb33..104ddac 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -50,7 +50,8 @@ # Huawei GTM900-B BOARD_gtm900b_OBJS=$(calypso_COMMON_OBJS) board/gtm900b/init.o \ - board/gtm900b/rffe_gtm900b.o board/gtm900b/rf_tables.o \ + board/gtm900b/rffe_gtm900b.o board/gta0x/rf_tables.o \ + board/gtm900b/afcparams.o \ board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS) BOARD_gtm900b_ENVIRONMENTS=highram diff --git a/src/target/firmware/board/gtm900b/afcparams.c b/src/target/firmware/board/gtm900b/afcparams.c new file mode 100644 index 0000000..ca8908d --- /dev/null +++ b/src/target/firmware/board/gtm900b/afcparams.c @@ -0,0 +1,47 @@ +/* + * This code was written by Mychaela Falconia + * who refuses to claim copyright on it and has released it as public domain + * instead. NO rights reserved, all rights relinquished. + * + * 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 + +/* + * Here is a representative set of AFC Psi parameters that has been + * calibrated by Huawei on a GTM900-B MGC2GSMT module, as recorded + * in the /gsm/rf/afcparams file: + * + * Psi_sta_inv: 13626 + * Psi_st: 4 + * Psi_st_32: 252168 + * Psi_st_inv: 17032 + * + * The following AFC slope number is the closest OsmocomBB-style afc_slope + * integer corresponding to these Psi numbers; the true value is somewhere + * between 115 and 116. + */ +int16_t afc_slope = 115; + +/* + * The compiled-in AFC initial DAC value below is the same as was used by + * the old OsmocomBB code written for Mot C1xx phones, but it will normally + * be overridden by the per-unit factory calibration value read from the + * /gsm/rf/afcdac file in FFS. + */ +int16_t afc_initial_dac_value = -700; diff --git a/src/target/firmware/board/gtm900b/rf_tables.c b/src/target/firmware/board/gtm900b/rf_tables.c deleted file mode 100644 index 7f5b0fd..0000000 --- a/src/target/firmware/board/gtm900b/rf_tables.c +++ /dev/null @@ -1,595 +0,0 @@ -/* - * This code was written by Mychaela Falconia - * who refuses to claim copyright on it and has released it as public domain - * instead. NO rights reserved, all rights relinquished. - * - * Tweaked (coding style changes) by 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, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include -#include -#include - -/* FIXME those are from the Compal phones, do measurements with the GTM900-B */ - -/* - * The following AFC initial DAC value and AFC slope settings are unchanged - * from the old OsmocomBB code in which they were hard-coded in layer1/afc.c. - * This AFC slope setting corresponds very closely to the original Leonardo - * Psi values which are used by Motorola's official fw at least on the C139, - * hence I have good reason to believe that they are indeed correct for the - * Mot C1xx hardware target family. - */ -int16_t afc_initial_dac_value = -700; -int16_t afc_slope = 287; - -/* APC offset (comes from the official firmware) for TI-classic targets */ -uint8_t apc_offset = 48; - -/* - * The following Tx levels tables are the ones compiled into Compal's - * firmwares; more specifically, they were originally extracted out - * of the one special Mot C11x fw version for which we got the linker - * map file with symbols and subsequently confirmed to be unchanged in - * Mot C139 and SE J100 firmwares. In normal operation the APC DAC values - * in these levels tables are replaced with the ones read from the per-unit - * and per-band factory calibration records. - * - * It should be noted that these compiled-in numbers are approximately - * correct for the C11x/12x/155/156 family (SKY77324 RF PA) but are totally - * wrong for the newer C139/140 (SKY77325) and SE J100 (SKY77328) hardware; - * it appears that Compal never bothered with changing these compiled-in - * numbers in their fw for the newer designs because the expectation is - * that these compiled-in numbers are just dummy placeholders to be - * overridden by per-unit calibration. - */ -struct txcal_tx_level rf_tx_levels_850[RF_TX_LEVELS_TABLE_SIZE] = { - { 560, 0, 0 }, /* 0 */ - { 560, 0, 0 }, /* 1 */ - { 560, 0, 0 }, /* 2 */ - { 560, 0, 0 }, /* 3 */ - { 560, 0, 0 }, /* 4 */ - { 638, 0, 0 }, /* 5 */ - { 554, 1, 0 }, /* 6 */ - { 467, 2, 0 }, /* 7 */ - { 395, 3, 0 }, /* 8 */ - { 337, 4, 0 }, /* 9 */ - { 290, 5, 0 }, /* 10 */ - { 253, 6, 0 }, /* 11 */ - { 224, 7, 0 }, /* 12 */ - { 201, 8, 0 }, /* 13 */ - { 183, 9, 0 }, /* 14 */ - { 168, 10, 0 }, /* 15 */ - { 157, 11, 0 }, /* 16 */ - { 148, 12, 0 }, /* 17 */ - { 141, 13, 0 }, /* 18 */ - { 136, 14, 0 }, /* 19 */ - { 46, 14, 0 }, /* 20 */ - { 46, 14, 0 }, /* 21 */ - { 46, 14, 0 }, /* 22 */ - { 46, 14, 0 }, /* 23 */ - { 46, 14, 0 }, /* 24 */ - { 46, 14, 0 }, /* 25 */ - { 46, 14, 0 }, /* 26 */ - { 46, 14, 0 }, /* 27 */ - { 46, 14, 0 }, /* 28 */ - { 46, 14, 0 }, /* 29 */ - { 46, 14, 0 }, /* 30 */ - { 46, 14, 0 }, /* 31 */ -}; - -struct txcal_tx_level rf_tx_levels_900[RF_TX_LEVELS_TABLE_SIZE] = { - { 550, 0, 0 }, /* 0 */ - { 550, 0, 0 }, /* 1 */ - { 550, 0, 0 }, /* 2 */ - { 550, 0, 0 }, /* 3 */ - { 550, 0, 0 }, /* 4 */ - { 550, 0, 0 }, /* 5 */ - { 476, 1, 0 }, /* 6 */ - { 402, 2, 0 }, /* 7 */ - { 338, 3, 0 }, /* 8 */ - { 294, 4, 0 }, /* 9 */ - { 260, 5, 0 }, /* 10 */ - { 226, 6, 0 }, /* 11 */ - { 204, 7, 0 }, /* 12 */ - { 186, 8, 0 }, /* 13 */ - { 172, 9, 0 }, /* 14 */ - { 161, 10, 0 }, /* 15 */ - { 153, 11, 0 }, /* 16 */ - { 146, 12, 0 }, /* 17 */ - { 141, 13, 0 }, /* 18 */ - { 137, 14, 0 }, /* 19 */ - { 43, 14, 0 }, /* 20 */ - { 43, 14, 0 }, /* 21 */ - { 43, 14, 0 }, /* 22 */ - { 43, 14, 0 }, /* 23 */ - { 43, 14, 0 }, /* 24 */ - { 43, 14, 0 }, /* 25 */ - { 43, 14, 0 }, /* 26 */ - { 43, 14, 0 }, /* 27 */ - { 43, 14, 0 }, /* 28 */ - { 43, 14, 0 }, /* 29 */ - { 43, 14, 0 }, /* 30 */ - { 43, 14, 0 }, /* 31 */ -}; - -struct txcal_tx_level rf_tx_levels_1800[RF_TX_LEVELS_TABLE_SIZE] = { - { 480, 0, 0 }, /* 0 */ - { 416, 1, 0 }, /* 1 */ - { 352, 2, 0 }, /* 2 */ - { 308, 3, 0 }, /* 3 */ - { 266, 4, 0 }, /* 4 */ - { 242, 5, 0 }, /* 5 */ - { 218, 6, 0 }, /* 6 */ - { 200, 7, 0 }, /* 7 */ - { 186, 8, 0 }, /* 8 */ - { 175, 9, 0 }, /* 9 */ - { 167, 10, 0 }, /* 10 */ - { 160, 11, 0 }, /* 11 */ - { 156, 12, 0 }, /* 12 */ - { 152, 13, 0 }, /* 13 */ - { 145, 14, 0 }, /* 14 */ - { 142, 15, 0 }, /* 15 */ - { 61, 15, 0 }, /* 16 */ - { 61, 15, 0 }, /* 17 */ - { 61, 15, 0 }, /* 18 */ - { 61, 15, 0 }, /* 19 */ - { 61, 15, 0 }, /* 20 */ - { 61, 15, 0 }, /* 21 */ - { 61, 15, 0 }, /* 22 */ - { 61, 15, 0 }, /* 23 */ - { 61, 15, 0 }, /* 24 */ - { 61, 15, 0 }, /* 25 */ - { 61, 15, 0 }, /* 26 */ - { 61, 15, 0 }, /* 27 */ - { 61, 15, 0 }, /* 28 */ - { 750, 0, 0 }, /* 29 */ - { 750, 0, 0 }, /* 30 */ - { 750, 0, 0 }, /* 31 */ -}; - -struct txcal_tx_level rf_tx_levels_1900[RF_TX_LEVELS_TABLE_SIZE] = { - { 520, 0, 0 }, /* 0 */ - { 465, 1, 0 }, /* 1 */ - { 390, 2, 0 }, /* 2 */ - { 330, 3, 0 }, /* 3 */ - { 285, 4, 0 }, /* 4 */ - { 250, 5, 0 }, /* 5 */ - { 225, 6, 0 }, /* 6 */ - { 205, 7, 0 }, /* 7 */ - { 190, 8, 0 }, /* 8 */ - { 177, 9, 0 }, /* 9 */ - { 168, 10, 0 }, /* 10 */ - { 161, 11, 0 }, /* 11 */ - { 155, 12, 0 }, /* 12 */ - { 150, 13, 0 }, /* 13 */ - { 147, 14, 0 }, /* 14 */ - { 143, 15, 0 }, /* 15 */ - { 62, 15, 0 }, /* 16 */ - { 62, 15, 0 }, /* 17 */ - { 62, 15, 0 }, /* 18 */ - { 62, 15, 0 }, /* 19 */ - { 62, 15, 0 }, /* 20 */ - { 62, 15, 0 }, /* 21 */ - { 62, 15, 0 }, /* 22 */ - { 62, 15, 0 }, /* 23 */ - { 62, 15, 0 }, /* 24 */ - { 62, 15, 0 }, /* 25 */ - { 62, 15, 0 }, /* 26 */ - { 62, 15, 0 }, /* 27 */ - { 62, 15, 0 }, /* 28 */ - { 915, 0, 0 }, /* 29 */ - { 915, 0, 0 }, /* 30 */ - { 915, 0, 0 }, /* 31 */ -}; - -struct txcal_ramp_def rf_tx_ramps_850[RF_TX_RAMP_SIZE] = { - { /* profile 0 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 0, 0, 9, 18, 25, 31, 30, 15, 0, 0}, - /* ramp-down */ - { 0, 11, 31, 31, 31, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 1 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 1, 1, 7, 16, 28, 31, 31, 13, 0, 0}, - /* ramp-down */ - { 0, 8, 31, 31, 31, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 2 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 1, 1, 8, 16, 29, 31, 31, 11, 0, 0}, - /* ramp-down */ - { 0, 8, 28, 31, 31, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 3 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 2, 0, 6, 18, 28, 31, 31, 12, 0, 0}, - /* ramp-down */ - { 0, 9, 24, 31, 31, 31, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 4 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 3, 0, 5, 19, 31, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 5 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 2, 0, 7, 18, 31, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 6 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 3, 0, 5, 20, 31, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 10, 21, 31, 31, 31, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 7 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 4, 0, 9, 23, 22, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 9, 24, 30, 31, 30, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 8 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 5, 0, 8, 21, 24, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 8, 23, 31, 31, 31, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 9 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 5, 0, 3, 1, 27, 22, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 8, 27, 25, 26, 31, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 10 */ - /* ramp-up */ - { 0, 0, 0, 0, 5, 0, 0, 2, 7, 22, 23, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 7, 25, 30, 31, 31, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 11 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 5, 0, 4, 8, 21, 21, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 8, 21, 31, 31, 31, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 12 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 7, 0, 0, 12, 22, 25, 31, 27, 4, 0, 0}, - /* ramp-down */ - { 0, 9, 12, 21, 31, 31, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 13 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 7, 0, 8, 15, 31, 31, 31, 5, 0, 0}, - /* ramp-down */ - { 0, 6, 14, 23, 31, 31, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 14 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 20, 0, 0, 8, 15, 14, 31, 31, 9, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 15 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, -}; - -struct txcal_ramp_def rf_tx_ramps_900[RF_TX_RAMP_SIZE] = { - { /* profile 0 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 0, 0, 9, 18, 25, 31, 30, 15, 0, 0}, - /* ramp-down */ - { 0, 11, 31, 31, 31, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 1 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 1, 1, 7, 16, 28, 31, 31, 13, 0, 0}, - /* ramp-down */ - { 0, 8, 31, 31, 31, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 2 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 1, 1, 8, 16, 29, 31, 31, 11, 0, 0}, - /* ramp-down */ - { 0, 8, 28, 31, 31, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 3 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 2, 0, 6, 18, 28, 31, 31, 12, 0, 0}, - /* ramp-down */ - { 0, 9, 24, 31, 31, 31, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 4 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 3, 0, 5, 19, 31, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 5 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 2, 0, 7, 18, 31, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 6 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 3, 0, 5, 20, 31, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 10, 21, 31, 31, 31, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 7 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 4, 0, 9, 23, 22, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 9, 24, 30, 31, 30, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 8 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 5, 0, 8, 21, 24, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 8, 23, 31, 31, 31, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 9 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 5, 0, 3, 1, 27, 22, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 8, 27, 25, 26, 31, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 10 */ - /* ramp-up */ - { 0, 0, 0, 0, 5, 0, 0, 2, 7, 22, 23, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 7, 25, 30, 31, 31, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 11 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 5, 0, 4, 8, 21, 21, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 8, 21, 31, 31, 31, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 12 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 7, 0, 0, 12, 22, 25, 31, 27, 4, 0, 0}, - /* ramp-down */ - { 0, 9, 12, 21, 31, 31, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 13 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 7, 0, 8, 15, 31, 31, 31, 5, 0, 0}, - /* ramp-down */ - { 0, 6, 14, 23, 31, 31, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 14 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 20, 0, 0, 8, 15, 14, 31, 31, 9, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 15 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - }, -}; - -struct txcal_ramp_def rf_tx_ramps_1800[RF_TX_RAMP_SIZE] = { - { /* profile 0 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 2, 3, 5, 16, 31, 31, 31, 9, 0, 0}, - /* ramp-down */ - { 0, 11, 31, 31, 31, 10, 11, 3, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 1 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 2, 3, 4, 17, 30, 31, 31, 10, 0, 0}, - /* ramp-down */ - { 0, 10, 31, 31, 31, 13, 9, 3, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 2 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 4, 2, 2, 18, 31, 31, 31, 9, 0, 0}, - /* ramp-down */ - { 0, 10, 26, 31, 31, 16, 10, 4, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 3 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 3, 4, 4, 15, 31, 31, 31, 9, 0, 0}, - /* ramp-down */ - { 0, 9, 31, 31, 31, 13, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 4 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 4, 3, 7, 11, 31, 31, 31, 10, 0, 0}, - /* ramp-down */ - { 0, 8, 31, 31, 31, 11, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 5 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 4, 3, 2, 7, 14, 25, 31, 31, 11, 0, 0}, - /* ramp-down */ - { 0, 14, 31, 31, 31, 9, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 6 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 7, 1, 3, 10, 12, 25, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 7, 30, 31, 31, 14, 4, 6, 5, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 7 */ - /* ramp-up */ - { 0, 0, 0, 0, 3, 5, 0, 5, 8, 12, 26, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 15, 0, 8, 5, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 8 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 9, 0, 3, 10, 16, 21, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 11, 28, 31, 27, 10, 11, 0, 10, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 9 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 10, 0, 6, 9, 15, 22, 29, 31, 6, 0, 0}, - /* ramp-down */ - { 0, 9, 22, 31, 31, 12, 5, 0, 18, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 10 */ - /* ramp-up */ - { 0, 0, 0, 0, 14, 0, 0, 8, 6, 20, 21, 29, 24, 6, 0, 0}, - /* ramp-down */ - { 0, 8, 28, 29, 26, 14, 6, 0, 17, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 11 */ - /* ramp-up */ - { 0, 0, 0, 0, 16, 0, 3, 5, 8, 16, 31, 28, 18, 3, 0, 0}, - /* ramp-down */ - { 0, 6, 18, 26, 31, 16, 9, 7, 0, 15, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 12 */ - /* ramp-up */ - { 0, 0, 0, 0, 19, 0, 3, 6, 8, 21, 24, 31, 14, 2, 0, 0}, - /* ramp-down */ - { 0, 0, 12, 31, 31, 27, 4, 0, 23, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 13 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 14, 14, 0, 0, 24, 31, 31, 14, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 11, 31, 31, 22, 11, 3, 19, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 14 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 30, 1, 4, 8, 18, 31, 31, 5, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 8, 31, 31, 22, 5, 0, 31, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 15 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 31, 13, 0, 0, 14, 31, 31, 8, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 4, 31, 31, 25, 5, 0, 5, 26, 1, 0, 0, 0, 0, 0}, - }, -}; - -struct txcal_ramp_def rf_tx_ramps_1900[RF_TX_RAMP_SIZE] = { - { /* profile 0 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 31, 31, 31, 12, 0, 0}, - /* ramp-down */ - { 0, 13, 31, 31, 31, 18, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 1 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 2, 3, 4, 17, 30, 31, 31, 10, 0, 0}, - /* ramp-down */ - { 0, 10, 31, 31, 31, 13, 9, 3, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 2 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 4, 2, 2, 18, 31, 31, 31, 9, 0, 0}, - /* ramp-down */ - { 0, 10, 26, 31, 31, 16, 10, 4, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 3 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 3, 4, 4, 15, 31, 31, 31, 9, 0, 0}, - /* ramp-down */ - { 0, 9, 31, 31, 31, 13, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 4 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 0, 4, 3, 0, 18, 31, 31, 31, 10, 0, 0}, - /* ramp-down */ - { 0, 8, 31, 31, 31, 11, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 5 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 4, 3, 2, 7, 14, 25, 31, 31, 11, 0, 0}, - /* ramp-down */ - { 0, 14, 31, 31, 31, 9, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 6 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 7, 1, 3, 10, 12, 25, 31, 31, 8, 0, 0}, - /* ramp-down */ - { 0, 7, 30, 31, 31, 14, 4, 6, 5, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 7 */ - /* ramp-up */ - { 0, 0, 0, 0, 3, 5, 0, 5, 8, 12, 26, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 7, 31, 31, 31, 15, 0, 8, 5, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 8 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 9, 0, 3, 10, 16, 21, 31, 31, 7, 0, 0}, - /* ramp-down */ - { 0, 11, 28, 31, 27, 10, 11, 0, 10, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 9 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 10, 0, 6, 9, 15, 22, 29, 31, 6, 0, 0}, - /* ramp-down */ - { 0, 9, 22, 31, 31, 12, 5, 0, 18, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 10 */ - /* ramp-up */ - { 0, 0, 0, 0, 14, 0, 0, 4, 10, 20, 21, 29, 24, 6, 0, 0}, - /* ramp-down */ - { 0, 8, 28, 29, 26, 14, 6, 0, 17, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 11 */ - /* ramp-up */ - { 0, 0, 0, 0, 16, 0, 3, 5, 8, 16, 31, 28, 18, 3, 0, 0}, - /* ramp-down */ - { 0, 6, 18, 26, 31, 16, 9, 7, 0, 15, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 12 */ - /* ramp-up */ - { 0, 0, 0, 0, 19, 0, 3, 6, 8, 21, 24, 31, 14, 2, 0, 0}, - /* ramp-down */ - { 0, 0, 12, 31, 31, 27, 4, 0, 23, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 13 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 14, 14, 0, 0, 24, 31, 31, 14, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 11, 31, 31, 22, 11, 3, 19, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 14 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 30, 1, 4, 8, 18, 31, 31, 5, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 8, 31, 31, 22, 5, 0, 31, 0, 0, 0, 0, 0, 0, 0}, - }, - { /* profile 15 */ - /* ramp-up */ - { 0, 0, 0, 0, 0, 30, 1, 4, 8, 18, 31, 31, 5, 0, 0, 0}, - /* ramp-down */ - { 0, 0, 8, 31, 31, 22, 5, 0, 31, 0, 0, 0, 0, 0, 0, 0}, - }, -}; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I52b63b1d086452139b1efd308d47a4183eace745 Gerrit-Change-Number: 20326 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:39:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:39:26 +0000 Subject: Change in osmocom-bb[master]: firmware: gtm900b: fix GPIO configuration References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20327 ) Change subject: firmware: gtm900b: fix GPIO configuration ...................................................................... firmware: gtm900b: fix GPIO configuration This change fixes one bug and one uncertainty: Bug: Huawei defined Calypso GPIO 3 to be DTR input on this modem, following TI's precedent from C-Sample and D-Sample platforms. (Huawei's documentation calls the corresponding FPC interface pin UART_DTR without even mentioning that it is actually wired to Calypso GPIO 3 in the hardware.) The previous code (erroneously copied from gta0x target which is different in this regard) configured this GPIO to be an output, creating a driver conflict. Uncertainty: GPIOs 4, 6, 10, 11 and 12 power up as inputs, and Huawei's official fw leaves them as such. But in the absence of someone reverse-engineering a sacrificial GTM900 module by slicing its PCB and imaging its copper layers and vias, we don't know if these Calypso pins are simply unconnected like they are on Openmoko devices (in which case they are floating inputs and should be switched to driving dummy outputs), or if they are tied off in the hardware in one way or another, in which case leaving them as inputs is correct. On the reasoning that floating inputs are a lesser evil than driver conflicts or shorted outputs, leave these GPIOs as inputs until we gain better knowledge of this aspect of the hardware. Related: OS#4769 Change-Id: Ia41f8bc19fb1775b0587fe1ceaa8acd066710aa5 --- M src/target/firmware/board/gtm900b/init.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/27/20327/1 diff --git a/src/target/firmware/board/gtm900b/init.c b/src/target/firmware/board/gtm900b/init.c index 38ede10..f04d314 100644 --- a/src/target/firmware/board/gtm900b/init.c +++ b/src/target/firmware/board/gtm900b/init.c @@ -67,14 +67,12 @@ writew(reg, ASIC_CONF_REG); /* - * Most Calypso peripheral interface signals are unconnected - * on this modem. We configure them to be GPIOs in IO_CONF_REG, - * then configure them to be outputs in IO_CNTL_REG, then set - * the outputs to 0 in ARMIO_LATCH_OUT. + * Configure Calypso GPIO and multifunction pins the same way + * how Huawei's official firmware configures them. */ writew(0x03F5, IO_CONF_REG); - writew(0xC000, IO_CNTL_REG); - writew(0x0000, ARMIO_LATCH_OUT); + writew(0xDC58, IO_CNTL_REG); + writew(0x0007, ARMIO_LATCH_OUT); /* Set LPG output permanently on (power LED) */ writew(1, LPG_PM_REG); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia41f8bc19fb1775b0587fe1ceaa8acd066710aa5 Gerrit-Change-Number: 20327 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:39:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:39:27 +0000 Subject: Change in osmocom-bb[master]: firmware: gtm900b: fix MEMIF configuration References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20328 ) Change subject: firmware: gtm900b: fix MEMIF configuration ...................................................................... firmware: gtm900b: fix MEMIF configuration * Switch Calypso output CS4/ADD22 to ADD22 function as needed in order to access the upper half of the flash on GTM900 hw variant MG01GSMT. * Set WS=4 for safety - please refer to this technical article for the underlying theory: https://www.freecalypso.org/hg/freecalypso-docs/file/tip/MEMIF-wait-states Related: OS#4769 Change-Id: I1923243937d7251f6bcfe71a0b1cc0e206a81cfa --- M src/target/firmware/board/gtm900b/init.c 1 file changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/20328/1 diff --git a/src/target/firmware/board/gtm900b/init.c b/src/target/firmware/board/gtm900b/init.c index f04d314..8de9956 100644 --- a/src/target/firmware/board/gtm900b/init.c +++ b/src/target/firmware/board/gtm900b/init.c @@ -50,6 +50,7 @@ #define ARMIO_LATCH_OUT 0xfffe4802 #define IO_CNTL_REG 0xfffe4804 +#define ARM_CONF_REG 0xfffef006 #define ASIC_CONF_REG 0xfffef008 #define IO_CONF_REG 0xfffef00a #define LPG_LCR_REG 0xfffe7800 @@ -77,13 +78,28 @@ /* Set LPG output permanently on (power LED) */ writew(1, LPG_PM_REG); writew((1 << 7), LPG_LCR_REG); + + /* configure ADD(22), needed for second half of flash on MG01GSMT */ + reg = readw(ARM_CONF_REG); + reg |= (1 << 3); + writew(reg, ARM_CONF_REG); } void board_init(int with_irq) { - /* Configure the memory interface */ - calypso_mem_cfg(CALYPSO_nCS0, 3, CALYPSO_MEM_16bit, 1); - calypso_mem_cfg(CALYPSO_nCS1, 3, CALYPSO_MEM_16bit, 1); + /* + * Configure the memory interface. + * Huawei's official fw sets WS=4 for RAM, but not for flash - + * but let's be consistent and use WS=4 for both. Please refer + * to this technical article for the underlying theory: +https://www.freecalypso.org/hg/freecalypso-docs/file/tip/MEMIF-wait-states + */ + calypso_mem_cfg(CALYPSO_nCS0, 4, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS1, 4, CALYPSO_MEM_16bit, 1); + /* + * The remaining 3 chip selects are unused on this hw, + * thus their settings are dummies. + */ calypso_mem_cfg(CALYPSO_nCS2, 5, CALYPSO_MEM_16bit, 1); calypso_mem_cfg(CALYPSO_nCS3, 5, CALYPSO_MEM_16bit, 1); calypso_mem_cfg(CALYPSO_CS4, 0, CALYPSO_MEM_8bit, 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1923243937d7251f6bcfe71a0b1cc0e206a81cfa Gerrit-Change-Number: 20328 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:39:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:39:27 +0000 Subject: Change in osmocom-bb[master]: firmware: gtm900b: fix flash-based hardware variant autodetection References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20329 ) Change subject: firmware: gtm900b: fix flash-based hardware variant autodetection ...................................................................... firmware: gtm900b: fix flash-based hardware variant autodetection The original code used simplified logic whereby it assumed that Spansion flash means MG01GSMT and Samsung flash means MGCxGSMT. However, there exist MGC2GSMT hw variants with Spansion S71PL032J flash in them, thus it is necessary to check the complete device ID rather than just the flash manufacturer ID to distinguish between MG01GSMT with 8 MiB flash (S71PL064J) and MGCxGSMT with 4 MiB flash (S71PL032J, K5A3281CTM or K5L3316CAM). Distinguishing between 4 MiB and 8 MiB flash chip types is also necessary in order to configure TIFFS reader for the correct FFS location matching that used by the original firmware, which is in turn necessary in order to read factory RF calibration values. Closes: OS#4769 Change-Id: Iaa5bd295e9cbf6b525fa385f9d6cd7fcd7f8a4dd --- M src/target/firmware/board/gtm900b/init.c M src/target/firmware/board/gtm900b/rffe_gtm900b.c 2 files changed, 72 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/29/20329/1 diff --git a/src/target/firmware/board/gtm900b/init.c b/src/target/firmware/board/gtm900b/init.c index 8de9956..934e96e 100644 --- a/src/target/firmware/board/gtm900b/init.c +++ b/src/target/firmware/board/gtm900b/init.c @@ -56,6 +56,8 @@ #define LPG_LCR_REG 0xfffe7800 #define LPG_PM_REG 0xfffe7801 +int gtm900_hw_is_mg01gsmt; + static void board_io_init(void) { uint16_t reg; @@ -85,6 +87,68 @@ writew(reg, ARM_CONF_REG); } +/* + * There exist two firmware-incompatible versions of GTM900-B hardware: + * MG01GSMT and MGCxGSMT. They have different flash chip types (8 MiB + * vs. 4 MiB) with correspondingly different TIFFS configurations + * (and we need TIFFS in order to read factory RF calibration values), + * and they have different (incompatible) RFFE control signals. + * + * We are going to check the flash chip type and use it to decide which + * hw variant we are running on. + */ +static void board_flash_init(void) +{ + uint16_t manufacturer_id, device_id[3]; + + /* Use an address above the Calypso boot ROM + * so we don't need to unmap it to access the flash. */ + flash_get_id((void *)0x40000, &manufacturer_id, device_id); + + switch (manufacturer_id) { + case CFI_MANUF_SPANSION: + /* is it S71PL064J? */ + if (device_id[0] == 0x227E && device_id[1] == 0x2202 && + device_id[2] == 0x2201) { + gtm900_hw_is_mg01gsmt = 1; + break; + } + /* is it S71PL032J? */ + if (device_id[0] == 0x227E && device_id[1] == 0x220A && + device_id[2] == 0x2201) { + gtm900_hw_is_mg01gsmt = 0; + break; + } + goto bad; + case CFI_MANUF_SAMSUNG: + /* is it K5A3281CTM? */ + if (device_id[0] == 0x22A0) { + gtm900_hw_is_mg01gsmt = 0; + break; + } + /* is it K5L3316CAM? */ + if (device_id[0] == 0x257E && device_id[1] == 0x2503 && + device_id[2] == 0x2501) { + gtm900_hw_is_mg01gsmt = 0; + break; + } + /* FALL THRU */ + default: + bad: + printf("Unknown module detected, " + "flash ID 0x%04x 0x%04x 0x%04x 0x%04x\n" + "Please contact mailing list!\n\n", manufacturer_id, + device_id[0], device_id[1], device_id[2]); + return; + } + + /* Initialize TIFFS reader */ + if (gtm900_hw_is_mg01gsmt) + tiffs_init(0x700000, 0x10000, 15); + else + tiffs_init(0x380000, 0x10000, 7); +} + void board_init(int with_irq) { /* @@ -151,4 +215,7 @@ /* Initialize ABB driver (uses SPI) */ twl3025_init(); + + /* Initialize board flash */ + board_flash_init(); } diff --git a/src/target/firmware/board/gtm900b/rffe_gtm900b.c b/src/target/firmware/board/gtm900b/rffe_gtm900b.c index 633c637..3efb5e2 100644 --- a/src/target/firmware/board/gtm900b/rffe_gtm900b.c +++ b/src/target/firmware/board/gtm900b/rffe_gtm900b.c @@ -1,5 +1,5 @@ /* RF frontend driver for Huawei GTM900-B modems, supporting both - * MG01GSMT and MG01GSMT hardware variants */ + * MG01GSMT and MGCxGSMT hardware variants */ /* (C) 2019 by Steve Markgraf * @@ -63,12 +63,7 @@ * Tx2: high band PA output */ -typedef enum rffe_var { - RFFE_MGC2GSMT, - RFFE_MG01GSMT -} rffe_var_t; - -static rffe_var_t rffe_variant = RFFE_MGC2GSMT; +extern int gtm900_hw_is_mg01gsmt; /* set in init.c */ static inline void rffe_mode_mgc2gsmt(enum gsm_band band, int tx) { @@ -139,10 +134,10 @@ /* switch RF Frontend Mode */ void rffe_mode(enum gsm_band band, int tx) { - if (rffe_variant == RFFE_MGC2GSMT) - rffe_mode_mgc2gsmt(band, tx); - else + if (gtm900_hw_is_mg01gsmt) rffe_mode_mg01gsmt(band, tx); + else + rffe_mode_mgc2gsmt(band, tx); } uint32_t rffe_get_rx_ports(void) @@ -166,7 +161,6 @@ void rffe_init(void) { uint16_t reg; - uint16_t manufacturer_id = 0; reg = readw(ARM_CONF_REG); reg &= ~ (1 << 7); /* TSPACT4 I/O function, not nRDYMEM */ @@ -176,28 +170,6 @@ tsp_setup(IOTA_STROBE, 1, 0, 0); trf6151_init(RITA_STROBE, RITA_RESET); - - /* Detect the used RFFE variant based on the used flash chip. - * The MGC2GSMT uses a Samsung flash, whereas the MG01GSMT uses - * a Spansion flash. We use an address above the Calpso bootrom - * so we do not need to unmap it to access the flash. */ - flash_get_id((void *)0x40000, &manufacturer_id, NULL); - - switch (manufacturer_id) { - case CFI_MANUF_SPANSION: - printf("Detected MG01GSMT module\n\n"); - rffe_variant = RFFE_MG01GSMT; - break; - case CFI_MANUF_SAMSUNG: - printf("Detected MGC2GSMT module\n\n"); - rffe_variant = RFFE_MGC2GSMT; - break; - default: - printf("Unknown module detected, flash ID 0x%4.4x\n" - "Please contact mailing list!\n\n", manufacturer_id); - rffe_variant = RFFE_MGC2GSMT; - break; - } } uint8_t rffe_get_gain(void) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaa5bd295e9cbf6b525fa385f9d6cd7fcd7f8a4dd Gerrit-Change-Number: 20329 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:45:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:45:15 +0000 Subject: Change in osmo-bsc[master]: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20234 ) Change subject: oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 Gerrit-Change-Number: 20234 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 23:45:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:45:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:45:30 +0000 Subject: Change in osmo-bsc[master]: pcu_sock: use tn as variable name to improve readability In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20291 ) Change subject: pcu_sock: use tn as variable name to improve readability ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5c8cf0e2d29fa4999983293401294ee0a94bfa30 Gerrit-Change-Number: 20291 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 23:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:45:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:45:50 +0000 Subject: Change in osmo-bsc[master]: pcuif_proto: protocol 9: add missing fields In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20292 ) Change subject: pcuif_proto: protocol 9: add missing fields ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia81310326b093a8e473b6c69045304667b3b60f1 Gerrit-Change-Number: 20292 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 23:45:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:46:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:46:04 +0000 Subject: Change in osmo-bsc[master]: pcuif_proto: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20293 ) Change subject: pcuif_proto: version 10: add frequency hopping parameters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5540fae66a116cbb25ec75b35145c36137146ffd Gerrit-Change-Number: 20293 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 23:46:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:46:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:46:20 +0000 Subject: Change in osmo-bsc[master]: pcuif_proto: version 10: add support for IPv6 NSVCs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20294 ) Change subject: pcuif_proto: version 10: add support for IPv6 NSVCs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I740be0a401612bb5ed4e8ccd7f4be8176b936449 Gerrit-Change-Number: 20294 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 30 Sep 2020 23:46:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:46:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:46:50 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 ) Change subject: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df Gerrit-Change-Number: 20259 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 30 Sep 2020 23:46:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:46:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:46:53 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 ) Change subject: add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c ...................................................................... add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df --- M include/osmocom/sigtran/sccp_helpers.h M src/sccp_helpers.c 2 files changed, 54 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/sccp_helpers.h b/include/osmocom/sigtran/sccp_helpers.h index 3ef7740..831307d 100644 --- a/include/osmocom/sigtran/sccp_helpers.h +++ b/include/osmocom/sigtran/sccp_helpers.h @@ -54,5 +54,14 @@ char *osmo_sccp_gt_dump(const struct osmo_sccp_gt *gt); char *osmo_sccp_addr_dump(const struct osmo_sccp_addr *addr); + +int osmo_sccp_inst_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr); +char *osmo_sccp_inst_addr_to_str_c(void *ctx, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr); +int osmo_sccp_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr); +char *osmo_sccp_addr_to_str_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); + char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); char *osmo_sccp_inst_addr_name(const struct osmo_sccp_instance *sccp, const struct osmo_sccp_addr *addr); diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index c103376..fe1133f 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -311,34 +311,57 @@ return buf; } -/* Like osmo_sccp_addr_dump() but print human readable representations instead of raw values. */ +int osmo_sccp_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + char ipbuf[INET6_ADDRSTRLEN]; + + OSMO_STRBUF_PRINTF(sb, "RI=%s", osmo_sccp_routing_ind_name(addr->ri)); + + if (addr->presence & OSMO_SCCP_ADDR_T_PC) + OSMO_STRBUF_PRINTF(sb, ",PC=%s", osmo_ss7_pointcode_print(ss7, addr->pc)); + if (addr->presence & OSMO_SCCP_ADDR_T_SSN) + OSMO_STRBUF_PRINTF(sb, ",SSN=%s", osmo_sccp_ssn_name(addr->ssn)); + if (addr->presence & OSMO_SCCP_ADDR_T_IPv4) + OSMO_STRBUF_PRINTF(sb, ",IP=%s", inet_ntop(AF_INET, &addr->ip.v4, ipbuf, sizeof(ipbuf))); + else if (addr->presence & OSMO_SCCP_ADDR_T_IPv6) + OSMO_STRBUF_PRINTF(sb, ",IP=%s", inet_ntop(AF_INET6, &addr->ip.v6, ipbuf, sizeof(ipbuf))); + if (addr->gt.gti != OSMO_SCCP_GTI_NO_GT || addr->presence & OSMO_SCCP_ADDR_T_GT) + OSMO_STRBUF_PRINTF(sb, ",GTI=%s", osmo_sccp_gti_name(addr->gt.gti)); + if (addr->presence & OSMO_SCCP_ADDR_T_GT) + OSMO_STRBUF_PRINTF(sb, ",GT=(%s)", osmo_sccp_gt_dump(&addr->gt)); + + return sb.chars_needed; +} + +char *osmo_sccp_addr_to_str_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_addr_to_str_buf, ss7, addr) +} + +/* Rather use osmo_sccp_addr_to_str_buf() or osmo_sccp_addr_to_str_c() to not use a static buffer */ char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) { static char buf[256]; - bool comma = false; - char ipbuf[INET6_ADDRSTRLEN]; - - buf[0] = '\0'; - - append_to_buf(buf, sizeof(buf), &comma, "RI=%s", osmo_sccp_routing_ind_name(addr->ri)); - - if (addr->presence & OSMO_SCCP_ADDR_T_PC) - append_to_buf(buf, sizeof(buf), &comma, "PC=%s", osmo_ss7_pointcode_print(ss7, addr->pc)); - if (addr->presence & OSMO_SCCP_ADDR_T_SSN) - append_to_buf(buf, sizeof(buf), &comma, "SSN=%s", osmo_sccp_ssn_name(addr->ssn)); - if (addr->presence & OSMO_SCCP_ADDR_T_IPv4) - append_to_buf(buf, sizeof(buf), &comma, "IP=%s", inet_ntop(AF_INET, &addr->ip.v4, ipbuf, sizeof(ipbuf))); - else if (addr->presence & OSMO_SCCP_ADDR_T_IPv6) - append_to_buf(buf, sizeof(buf), &comma, "IP=%s", inet_ntop(AF_INET6, &addr->ip.v6, ipbuf, sizeof(ipbuf))); - if (addr->gt.gti != OSMO_SCCP_GTI_NO_GT || addr->presence & OSMO_SCCP_ADDR_T_GT) - append_to_buf(buf, sizeof(buf), &comma, "GTI=%s", osmo_sccp_gti_name(addr->gt.gti)); - if (addr->presence & OSMO_SCCP_ADDR_T_GT) - append_to_buf(buf, sizeof(buf), &comma, "GT=(%s)", osmo_sccp_gt_dump(&addr->gt)); - + osmo_sccp_addr_to_str_buf(buf, sizeof(buf), ss7, addr); return buf; } -/* Derive ss7 from the sccp instance and call osmo_sccp_addr_name() with that. +int osmo_sccp_inst_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr) +{ + return osmo_sccp_addr_to_str_buf(buf, buf_len, sccp? sccp->ss7 : NULL, addr); +} + +char *osmo_sccp_inst_addr_to_str_c(void *ctx, const struct osmo_sccp_instance *sccp, + const struct osmo_sccp_addr *addr) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_inst_addr_to_str_buf, sccp, addr); +} + +/* Rather use osmo_sccp_inst_addr_to_str_buf() or osmo_sccp_inst_addr_to_str_c() to not use a static buffer. + * Derive ss7 from the sccp instance and call osmo_sccp_addr_name() with that. * If sccp is passed as NULL, simply use the default point code format. */ char *osmo_sccp_inst_addr_name(const struct osmo_sccp_instance *sccp, const struct osmo_sccp_addr *addr) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia7f9d891ea92abd20855374b936aac8b28ae15df Gerrit-Change-Number: 20259 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:46:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:46:53 +0000 Subject: Change in libosmo-sccp[master]: add osmo_sccp_addr_to_id_c() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 ) Change subject: add osmo_sccp_addr_to_id_c() ...................................................................... add osmo_sccp_addr_to_id_c() Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb --- M include/osmocom/sigtran/sccp_helpers.h M src/sccp_helpers.c 2 files changed, 39 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/include/osmocom/sigtran/sccp_helpers.h b/include/osmocom/sigtran/sccp_helpers.h index 831307d..dc4e115 100644 --- a/include/osmocom/sigtran/sccp_helpers.h +++ b/include/osmocom/sigtran/sccp_helpers.h @@ -63,5 +63,9 @@ const struct osmo_sccp_addr *addr); char *osmo_sccp_addr_to_str_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); +int osmo_sccp_addr_to_id_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr); +char *osmo_sccp_addr_to_id_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); + char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr); char *osmo_sccp_inst_addr_name(const struct osmo_sccp_instance *sccp, const struct osmo_sccp_addr *addr); diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index fe1133f..2dc762e 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -311,8 +311,8 @@ return buf; } -int osmo_sccp_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, - const struct osmo_sccp_addr *addr) +static int sccp_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr, char sep_char) { struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; char ipbuf[INET6_ADDRSTRLEN]; @@ -320,26 +320,53 @@ OSMO_STRBUF_PRINTF(sb, "RI=%s", osmo_sccp_routing_ind_name(addr->ri)); if (addr->presence & OSMO_SCCP_ADDR_T_PC) - OSMO_STRBUF_PRINTF(sb, ",PC=%s", osmo_ss7_pointcode_print(ss7, addr->pc)); + OSMO_STRBUF_PRINTF(sb, "%cPC=%s", sep_char, osmo_ss7_pointcode_print(ss7, addr->pc)); if (addr->presence & OSMO_SCCP_ADDR_T_SSN) - OSMO_STRBUF_PRINTF(sb, ",SSN=%s", osmo_sccp_ssn_name(addr->ssn)); + OSMO_STRBUF_PRINTF(sb, "%cSSN=%s", sep_char, osmo_sccp_ssn_name(addr->ssn)); if (addr->presence & OSMO_SCCP_ADDR_T_IPv4) - OSMO_STRBUF_PRINTF(sb, ",IP=%s", inet_ntop(AF_INET, &addr->ip.v4, ipbuf, sizeof(ipbuf))); + OSMO_STRBUF_PRINTF(sb, "%cIP=%s", sep_char, inet_ntop(AF_INET, &addr->ip.v4, ipbuf, sizeof(ipbuf))); else if (addr->presence & OSMO_SCCP_ADDR_T_IPv6) - OSMO_STRBUF_PRINTF(sb, ",IP=%s", inet_ntop(AF_INET6, &addr->ip.v6, ipbuf, sizeof(ipbuf))); + OSMO_STRBUF_PRINTF(sb, "%cIP=%s", sep_char, inet_ntop(AF_INET6, &addr->ip.v6, ipbuf, sizeof(ipbuf))); if (addr->gt.gti != OSMO_SCCP_GTI_NO_GT || addr->presence & OSMO_SCCP_ADDR_T_GT) - OSMO_STRBUF_PRINTF(sb, ",GTI=%s", osmo_sccp_gti_name(addr->gt.gti)); + OSMO_STRBUF_PRINTF(sb, "%cGTI=%s", sep_char, osmo_sccp_gti_name(addr->gt.gti)); if (addr->presence & OSMO_SCCP_ADDR_T_GT) - OSMO_STRBUF_PRINTF(sb, ",GT=(%s)", osmo_sccp_gt_dump(&addr->gt)); + OSMO_STRBUF_PRINTF(sb, "%cGT=(%s)", sep_char, osmo_sccp_gt_dump(&addr->gt)); return sb.chars_needed; } +int osmo_sccp_addr_to_str_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr) +{ + return sccp_addr_to_str_buf(buf, buf_len, ss7, addr, ','); +} + char *osmo_sccp_addr_to_str_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) { OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_addr_to_str_buf, ss7, addr) } +/*! like osmo_sccp_addr_to_str_buf, but using only characters passing osmo_identifier_valid(). Useful for FSM and CTRL + * IDs. + * + * The advantage over using osmo_sccp_addr_to_str_buf() followed by osmo_identifier_sanitize_buf() is that here, the + * address elements are separated by ':', while osmo_identifier_sanitize_buf() would replace all characters with the + * same, e.g. '-'. + */ +int osmo_sccp_addr_to_id_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *ss7, + const struct osmo_sccp_addr *addr) +{ + int rc = sccp_addr_to_str_buf(buf, buf_len, ss7, addr, ':'); + /* inet_ntop() and osmo_sccp_gt_dump() may have written non-id chars. */ + osmo_identifier_sanitize_buf(buf, "", '-'); + return rc; +} + +char *osmo_sccp_addr_to_id_c(void *ctx, const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_sccp_addr_to_id_buf, ss7, addr) +} + /* Rather use osmo_sccp_addr_to_str_buf() or osmo_sccp_addr_to_str_c() to not use a static buffer */ char *osmo_sccp_addr_name(const struct osmo_ss7_instance *ss7, const struct osmo_sccp_addr *addr) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/20260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iadd34a167a7712796b2501f6a75b5a8d26a828eb Gerrit-Change-Number: 20260 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:47:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:47:37 +0000 Subject: Change in osmocom-bb[master]: firmware: implement reading of factory RF calibration values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/12887 ) Change subject: firmware: implement reading of factory RF calibration values ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/12887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icf2693b751d86ec1d2563412d606c13d4c91a806 Gerrit-Change-Number: 12887 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 30 Sep 2020 23:47:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:47:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:47:57 +0000 Subject: Change in osmocom-bb[master]: firmware: implement reading of factory RF calibration values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/12887 ) Change subject: firmware: implement reading of factory RF calibration values ...................................................................... Patch Set 6: Code-Review-1 my bad, the commit now lists myself as author. need to fix that up. Sorry. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/12887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icf2693b751d86ec1d2563412d606c13d4c91a806 Gerrit-Change-Number: 12887 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 30 Sep 2020 23:47:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:48:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:48:50 +0000 Subject: Change in osmocom-bb[master]: firmware: implement reading of factory RF calibration values In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#7) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/12887 ) Change subject: firmware: implement reading of factory RF calibration values ...................................................................... firmware: implement reading of factory RF calibration values Since If6e212baeb10953129fb0d5253d263567f5e12d6, we can read the TIFFS file-system, thus we can read and use the factory RF calibration values. * Implement parsing of factory RF calibration values for Motorola C1xx, Openmoko GTA0x, Pirelli DP-L10, and upcoming FCDEV3B targets. * Remove the old Tx power level control code and tables, and replace them with new logic that exactly matches what the official chipset firmware (TI/FreeCalypso) does, using tables in TI/FreeCalypso format. Compiled-in tables serve as a fallback and match each target's respective original firmware. * Use individual AFC slope values for different targets. The original value was/is only correct for the Mot C1xx family, whereas GTA0x/FCDEV3B and Pirelli DP-L10 need different values because Openmoko's VCXO (copied on the FCDEV3B) and Pirelli's VCTCXO are different from what Motorola used. * Take the initial AFC DAC value for the FB search from factory calibration records on those targets on which it has been calibrated per unit at the factory. * Use individual APC offset for different targets instead of the hard-coded value. The Mot/Compal's and Pirelli's firmwares (both heavily modified relative to TI) use different APC offset settings: 32 for Compal and 0 for Pirelli, while Openmoko and FreeCalypso devices use 48. Change-Id: Icf2693b751d86ec1d2563412d606c13d4c91a806 Related: OS#3582 --- M src/target/firmware/Makefile M src/target/firmware/apps/layer1/main.c M src/target/firmware/apps/rssi/main.c A src/target/firmware/board/common/readcal_tiffs.c A src/target/firmware/board/common/tx_calchan.c A src/target/firmware/board/compal/readcal_common.c A src/target/firmware/board/compal/readcal_small.c D src/target/firmware/board/compal/rf_power.c A src/target/firmware/board/compal/rf_tables.c A src/target/firmware/board/compal_e86/tx_ramps.c A src/target/firmware/board/compal_e88/tx_ramps.c A src/target/firmware/board/compal_e99/readcal.c D src/target/firmware/board/gta0x/rf_power.c A src/target/firmware/board/gta0x/rf_tables.c M src/target/firmware/board/gta0x/rffe_gta0x_triband.c D src/target/firmware/board/gtm900b/rf_power.c A src/target/firmware/board/gtm900b/rf_tables.c A src/target/firmware/board/pirelli_dpl10/readcal.c D src/target/firmware/board/pirelli_dpl10/rf_power.c A src/target/firmware/board/pirelli_dpl10/rf_tables.c A src/target/firmware/board/se_j100/tx_ramps.c D src/target/firmware/include/layer1/apc.h A src/target/firmware/include/rf/readcal.h A src/target/firmware/include/rf/txcal.h A src/target/firmware/include/rf/vcxocal.h M src/target/firmware/layer1/Makefile M src/target/firmware/layer1/afc.c D src/target/firmware/layer1/apc.c M src/target/firmware/layer1/sync.c 29 files changed, 4,023 insertions(+), 351 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/87/12887/7 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/12887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icf2693b751d86ec1d2563412d606c13d4c91a806 Gerrit-Change-Number: 12887 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:48:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:48:50 +0000 Subject: Change in osmocom-bb[master]: firmware: calibration: split afcparams.c from rf_tables.c for gta0x In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/20325 to look at the new patch set (#2). Change subject: firmware: calibration: split afcparams.c from rf_tables.c for gta0x ...................................................................... firmware: calibration: split afcparams.c from rf_tables.c for gta0x We have new hardware targets that have appeared since the original OS#3582 patch was created, namely Huawei GTM900-B and the upcoming FreeCalypso Caramel2 board. These new targets need the same APC offset as gta0x and fcdev3b (TI's original Leonardo value), they have proper calibration records in their FFS (meaning that all compiled-in numbers become no-effect placeholders), and their PA tracts are similar enough to Openmoko/FCDEV3B to where even in the absence of calibration OM/FC numbers are close enough. Thus most of the tables in board/gta0x/rf_tables.c should be reusable by these new targets. However, these new targets have quite different VCXOs from Openmoko and FCDEV3B, thus they need different AFC parameters. Thus we split board/gta0x/afcparams.c from board/gta0x/rf_tables.c, making the latter more reusable. Related: OS#3582 Change-Id: I92e245843253f279dd6d61bd5098766694c5215f --- M src/target/firmware/Makefile A src/target/firmware/board/gta0x/afcparams.c M src/target/firmware/board/gta0x/rf_tables.c 3 files changed, 55 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/20325/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I92e245843253f279dd6d61bd5098766694c5215f Gerrit-Change-Number: 20325 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:48:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:48:50 +0000 Subject: Change in osmocom-bb[master]: firmware: calibration: proper support for gtm900b target In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/20326 to look at the new patch set (#2). Change subject: firmware: calibration: proper support for gtm900b target ...................................................................... firmware: calibration: proper support for gtm900b target GTM900-B can share almost all calibration tables with GTA0x and FCDEV3B, only the VCXO is significantly different. Related: OS#3582 Change-Id: I52b63b1d086452139b1efd308d47a4183eace745 --- M src/target/firmware/Makefile A src/target/firmware/board/gtm900b/afcparams.c D src/target/firmware/board/gtm900b/rf_tables.c 3 files changed, 49 insertions(+), 596 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/26/20326/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I52b63b1d086452139b1efd308d47a4183eace745 Gerrit-Change-Number: 20326 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:48:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:48:50 +0000 Subject: Change in osmocom-bb[master]: firmware: gtm900b: fix GPIO configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/20327 to look at the new patch set (#2). Change subject: firmware: gtm900b: fix GPIO configuration ...................................................................... firmware: gtm900b: fix GPIO configuration This change fixes one bug and one uncertainty: Bug: Huawei defined Calypso GPIO 3 to be DTR input on this modem, following TI's precedent from C-Sample and D-Sample platforms. (Huawei's documentation calls the corresponding FPC interface pin UART_DTR without even mentioning that it is actually wired to Calypso GPIO 3 in the hardware.) The previous code (erroneously copied from gta0x target which is different in this regard) configured this GPIO to be an output, creating a driver conflict. Uncertainty: GPIOs 4, 6, 10, 11 and 12 power up as inputs, and Huawei's official fw leaves them as such. But in the absence of someone reverse-engineering a sacrificial GTM900 module by slicing its PCB and imaging its copper layers and vias, we don't know if these Calypso pins are simply unconnected like they are on Openmoko devices (in which case they are floating inputs and should be switched to driving dummy outputs), or if they are tied off in the hardware in one way or another, in which case leaving them as inputs is correct. On the reasoning that floating inputs are a lesser evil than driver conflicts or shorted outputs, leave these GPIOs as inputs until we gain better knowledge of this aspect of the hardware. Related: OS#4769 Change-Id: Ia41f8bc19fb1775b0587fe1ceaa8acd066710aa5 --- M src/target/firmware/board/gtm900b/init.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/27/20327/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia41f8bc19fb1775b0587fe1ceaa8acd066710aa5 Gerrit-Change-Number: 20327 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:48:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:48:50 +0000 Subject: Change in osmocom-bb[master]: firmware: gtm900b: fix MEMIF configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/20328 to look at the new patch set (#2). Change subject: firmware: gtm900b: fix MEMIF configuration ...................................................................... firmware: gtm900b: fix MEMIF configuration * Switch Calypso output CS4/ADD22 to ADD22 function as needed in order to access the upper half of the flash on GTM900 hw variant MG01GSMT. * Set WS=4 for safety - please refer to this technical article for the underlying theory: https://www.freecalypso.org/hg/freecalypso-docs/file/tip/MEMIF-wait-states Related: OS#4769 Change-Id: I1923243937d7251f6bcfe71a0b1cc0e206a81cfa --- M src/target/firmware/board/gtm900b/init.c 1 file changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/20328/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1923243937d7251f6bcfe71a0b1cc0e206a81cfa Gerrit-Change-Number: 20328 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:48:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:48:50 +0000 Subject: Change in osmocom-bb[master]: firmware: gtm900b: fix flash-based hardware variant autodetection In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/20329 to look at the new patch set (#2). Change subject: firmware: gtm900b: fix flash-based hardware variant autodetection ...................................................................... firmware: gtm900b: fix flash-based hardware variant autodetection The original code used simplified logic whereby it assumed that Spansion flash means MG01GSMT and Samsung flash means MGCxGSMT. However, there exist MGC2GSMT hw variants with Spansion S71PL032J flash in them, thus it is necessary to check the complete device ID rather than just the flash manufacturer ID to distinguish between MG01GSMT with 8 MiB flash (S71PL064J) and MGCxGSMT with 4 MiB flash (S71PL032J, K5A3281CTM or K5L3316CAM). Distinguishing between 4 MiB and 8 MiB flash chip types is also necessary in order to configure TIFFS reader for the correct FFS location matching that used by the original firmware, which is in turn necessary in order to read factory RF calibration values. Closes: OS#4769 Change-Id: Iaa5bd295e9cbf6b525fa385f9d6cd7fcd7f8a4dd --- M src/target/firmware/board/gtm900b/init.c M src/target/firmware/board/gtm900b/rffe_gtm900b.c 2 files changed, 72 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/29/20329/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaa5bd295e9cbf6b525fa385f9d6cd7fcd7f8a4dd Gerrit-Change-Number: 20329 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Sep 30 23:49:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 30 Sep 2020 23:49:13 +0000 Subject: Change in osmocom-bb[master]: firmware: implement reading of factory RF calibration values In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/12887 ) Change subject: firmware: implement reading of factory RF calibration values ...................................................................... Removed Code-Review-1 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/12887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icf2693b751d86ec1d2563412d606c13d4c91a806 Gerrit-Change-Number: 12887 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: